From dfe6937666886a005207b45015ea7b33c1c512b7 Mon Sep 17 00:00:00 2001
From: kjellander <kjellander@webrtc.org>
Date: Mon, 13 Jun 2016 14:11:02 -0700
Subject: [PATCH] Revert of Roll chromium_revision 7fa6701bc5..1a73d11e65
 (398458:399420) (patchset #2 id:20001 of
 https://codereview.webrtc.org/2061723002/ )

Reason for revert:
webrtc_perf_tests fails on all Android Release testers:
http://build.chromium.org/p/client.webrtc/builders/Android64%20Tests%20%28L%20Nexus9%29/builds/3673

Original issue's description:
> Roll chromium_revision 7fa6701bc5..1a73d11e65 (398458:399420)
>
> A fix was needed to make Android tests pass after
> https://codereview.chromium.org/2043803003
>
> Change log: https://chromium.googlesource.com/chromium/src/+log/7fa6701bc5..1a73d11e65
> Full diff: https://chromium.googlesource.com/chromium/src/+/7fa6701bc5..1a73d11e65
>
> Changed dependencies:
> * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/8dd3c8e39a..099f1da55b
> * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/0fc7df55c0..171b5403ee
> * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/7f03319b9d..bcb8b67b8b
> DEPS diff: https://chromium.googlesource.com/chromium/src/+/7fa6701bc5..1a73d11e65/DEPS
>
> No update to Clang.
>
> TBR=
> BUG=webrtc:5990
> NOTRY=True
>
> Committed: https://crrev.com/c49cf1308f879ce029f5f0e804b4eef3b08b67c5
> Cr-Commit-Position: refs/heads/master@{#13117}

TBR=
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:5990

Review-Url: https://codereview.webrtc.org/2059423002
Cr-Commit-Position: refs/heads/master@{#13118}
---
 DEPS                                 | 2 +-
 build_overrides/build.gni            | 3 ---
 webrtc/test/testsupport/fileutils.cc | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/DEPS b/DEPS
index 85dfea346d..5708c39bd6 100644
--- a/DEPS
+++ b/DEPS
@@ -6,7 +6,7 @@
 vars = {
   'extra_gyp_flag': '-Dextra_gyp_flag=0',
   'chromium_git': 'https://chromium.googlesource.com',
-  'chromium_revision': '1a73d11e65f5af4fc946a00ed1a2b7022ed28c64',
+  'chromium_revision': '7fa6701bc5183bd5a73203d4fe1309f75ccfd5b4',
 }
 
 # NOTE: Use http rather than https; the latter can cause problems for users
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index da8a1d5e82..1088355ef7 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -13,9 +13,6 @@
 mac_sdk_min_build_override = "10.11"
 mac_deployment_target_build_override = "10.7"
 
-# Some non-Chromium builds don't support building java targets.
-enable_java_templates = true
-
 # Variable that can be used to support multiple build scenarios, like having
 # Chromium specific targets in a client project's GN file etc.
 build_with_chromium = false
diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc
index 4bf8c5fa19..d99b990918 100644
--- a/webrtc/test/testsupport/fileutils.cc
+++ b/webrtc/test/testsupport/fileutils.cc
@@ -57,7 +57,7 @@ const char* kPathDelimiter = "/";
 #endif
 
 #ifdef WEBRTC_ANDROID
-const char* kRootDirName = "/sdcard/chromium_tests_root/";
+const char* kRootDirName = "/sdcard/";
 #else
 // The file we're looking for to identify the project root dir.
 const char* kProjectRootFileName = "DEPS";