Revert base roll and its fallout.

Updating base turns out to be more complicated than I thought.

This reverts commit daa822a.
This reverts commit c38428c.
This reverts commit 4b73a8a.

DEPS

@@ -20,7 +20,7 @@
 vars = {
   'chromium_git': 'https://chromium.googlesource.com',
   'mojo_sdk_revision': 'fbe912aa65e0346382bc1e2874eb88fa3aad3358',
-  'base_revision': 'ff0b4b505e01de0098fd6ed13cf6661fa58be851',
+  'base_revision': '672b04e54b937ec899429a6bd5409c5a6300d151',
   'skia_revision': '8cc209111876b7c78b5ec577c9221d8ed5e21024',
 
   # Note: When updating the Dart revision, ensure that all entries that are
@@ -30,7 +30,7 @@ vars = {
   'dart_observatory_packages_revision': 'cf90eb9077177d3d6b3fd5e8289477c2385c026a',
   'dart_root_certificates_revision': 'aed07942ce98507d2be28cbd29e879525410c7fc',
 
-  'buildtools_revision': '222bd42ce39d1bd8f08fe089b066f49c469e1cdf',
+  'buildtools_revision': '565d04e8741429fb1b4f26d102f2c6c3b849edeb',
 }
 
 # Only these hosts are allowed for dependencies in this DEPS file.
@@ -42,19 +42,19 @@ allowed_hosts = [
 
 deps = {
   'src/base':
-   'https://github.com/domokit/base.git' + '@' + Var('base_revision'),
+   Var('chromium_git') + '/external/github.com/domokit/base' + '@' +  Var('base_revision'),
 
   'src/buildtools':
    Var('chromium_git') + '/chromium/buildtools.git' + '@' +  Var('buildtools_revision'),
 
   'src/testing/gtest':
-   Var('chromium_git') + '/external/googletest.git' + '@' + '9855a87157778d39b95eccfb201a9dc90f6d61c6',
+   Var('chromium_git') + '/external/googletest.git' + '@' + '23574bf2333f834ff665f894c97bef8a5b33a0a9',
 
   'src/testing/gmock':
-   Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be',
+   Var('chromium_git') + '/external/googlemock.git' + '@' + '29763965ab52f24565299976b936d1265cb6a271',
 
   'src/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '94e4b770ce2f6065d4261d29c32683a6099b9d93',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'c3f79166089e5360c09e3053fce50e6e296c3204',
 
   'src/dart':
     Var('chromium_git') + '/external/github.com/dart-lang/sdk.git' + '@' + Var('dart_revision'),
@@ -80,7 +80,7 @@ deps = {
    Var('chromium_git') + '/skia.git' + '@' +  Var('skia_revision'),
 
   'src/third_party/yasm/source/patched-yasm':
-   Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a',
+   Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '4671120cd8558ce62ee8672ebf3eb6f5216f909b',
 
   'src/third_party/libjpeg_turbo':
    Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'f4631b6ee8b1dbb05e51ae335a7886f9ac598ab6',

build/secondary/testing/gtest/BUILD.gn

@@ -20,6 +20,10 @@ config("gtest_config") {
   # Gtest headers need to be able to find themselves.
   include_dirs = [ "include" ]
 
+  if (is_win) {
+    cflags = [ "/wd4800" ]  # Unused variable warning.
+  }
+
   if (is_posix) {
     defines += [
       # gtest isn't able to figure out when RTTI is disabled for gcc
@@ -107,6 +111,16 @@ static_library("gtest") {
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
+
+  config("gtest_warnings") {
+    if (is_win && is_clang) {
+      # The Mutex constructor initializer list in gtest-port.cc is incorrectly
+      # ordered. See
+      # https://groups.google.com/d/msg/googletestframework/S5uSV8L2TX8/U1FaTDa6J6sJ.
+      cflags = [ "-Wno-reorder" ]
+    }
+  }
+  configs += [ ":gtest_warnings" ]
 }
 
 source_set("gtest_main") {

build/secondary/third_party/android_tools/BUILD.gn

@@ -28,8 +28,11 @@ android_java_prebuilt("uiautomator_java") {
   jar_path = "$android_sdk/uiautomator.jar"
 }
 
+android_java_prebuilt("android_support_annotations_javalib") {
+  jar_path = "$android_sdk_root/extras/android/support/annotations/android-support-annotations.jar"
+}
+
 java_prebuilt("android_support_multidex_java") {
-  supports_android = true
   jar_path = "$android_sdk_root/extras/android/support/multidex/library/libs/android-support-multidex.jar"
 }
 
@@ -64,8 +67,8 @@ android_resources("android_support_v7_mediarouter_resources") {
 
 android_java_prebuilt("android_support_v7_mediarouter_java") {
   deps = [
-    ":android_support_v7_appcompat_java",
     ":android_support_v7_mediarouter_resources",
+    ":android_support_v7_appcompat_java",
   ]
   jar_path = "$android_sdk_root/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar"
 }
@@ -93,7 +96,9 @@ android_resources("google_play_services_default_resources") {
 android_java_prebuilt("google_play_services_default_java") {
   deps = [
     ":android_support_v13_java",
+    ":android_support_v7_mediarouter_java",
     ":google_play_services_default_resources",
   ]
+  proguard_preprocess = false
   jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
 }