Roll chromium_revision ce95e5d83f..964fc7fe50 (465389:478724)

Manual changes:
* Add new third_party/googletest (replaces testing/gtest and testing/gmock).
* Add Android deps third_party/ub-uiautomator and xstream.
* Remove the no longer existing clang_format_merge_driver
* Java 8 had to be installed on the Android builder machines (crbug.com/732529).

Change log: ce95e5d83f..964fc7fe50
Full diff: ce95e5d83f..964fc7fe50

Changed dependencies:
* src/base: f6489f4fd2..7830ef61f5
* src/build: bca1cbe2aa..b887a61b49
* src/buildtools: 88811f48a6..b53a03df32
* src/ios: 9595ed7ed6..4243f190b3
* src/testing: 7b3e681f96..4d1ed658b7
* src/third_party: b28b3325f9..d09084e5dd
* src/third_party/android_tools: https://chromium.googlesource.com/android_tools.git/+log/b65c4776da..023e2f6540
* src/third_party/catapult: e8775f0f64..7ba431f75d
* src/third_party/ced/src: e21eb6aed1..910cca22d8
* src/third_party/icu: b34251f8b7..dfa798fe69
* src/third_party/libjpeg_turbo: 7260e4d8b8..a1750dbc79
* src/tools: 5c327d115e..b8af3bf606
* src/tools/swarming_client: 11e31afa5d..af6b06ca68
DEPS diff: ce95e5d83f..964fc7fe50/DEPS

Clang version changed 299960:303910
Details: ce95e5d83f..964fc7fe50/tools/clang/scripts/update.py

TBR=
BUG=None

Change-Id: I84a5108a48d7cddb71df886cd9cb7e7ed21648ef
Reviewed-on: https://chromium-review.googlesource.com/532013
Commit-Queue: Henrik Kjellander <kjellander@chromium.org>
Reviewed-by: Frank Barchard <fbarchard@google.com>

DEPS

@@ -1,7 +1,7 @@
 vars = {
   'chromium_git': 'https://chromium.googlesource.com',
-  'chromium_revision': 'ce95e5d83f3538e5797b85f986e52afda8a7a40a',
+  'chromium_revision': '964fc7fe50b27ffb527e3e237e46650c18599578',
-  'swarming_revision': '11e31afa5d330756ff87aa12064bb5d032896cb5',
+  'swarming_revision': 'af6b06ca68ba7a618024f28856418296a9acf375',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling lss
   # and whatever else without interference from each other.
@@ -9,32 +9,30 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': 'e8775f0f64bcae6b0789df6d4a2a5aca9f5cf4ac',
+  'catapult_revision': '7ba431f75da5234ec64fe83dfe1d11d19a97581d',
 }
 
 deps = {
   'src/build':
-    Var('chromium_git') + '/chromium/src/build' + '@' + 'bca1cbe2aaed610e412eed70a3a7d22799c65259',
+    Var('chromium_git') + '/chromium/src/build' + '@' + 'b887a61b49dc53baa63177f448ecfd5750086d04',
   'src/buildtools':
-    Var('chromium_git') + '/chromium/buildtools.git' + '@' + '88811f48a6b79786ef35be86825642fc33011151',
+    Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'b53a03df323e7fa7dafd892adbe70bf9f3cc97f7',
   'src/testing':
-    Var('chromium_git') + '/chromium/src/testing' + '@' + '7b3e681f96c5bc54d1ba4a47285a9874ed18514f',
+    Var('chromium_git') + '/chromium/src/testing' + '@' + '4d1ed658b76be14c3634b9a401e7e9a86f1cfaa7',
-  'src/testing/gtest':
-    Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87',
-  'src/testing/gmock':
-    Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566
   'src/third_party':
-    Var('chromium_git') + '/chromium/src/third_party' + '@' + 'b28b3325f9374dd79d3a874d6dd688222d61f4f1',
+    Var('chromium_git') + '/chromium/src/third_party' + '@' + 'd09084e5dd3ed2a63589c3751098b3bd194793ac',
   'src/third_party/catapult':
    Var('chromium_git') + '/external/github.com/catapult-project/catapult.git' + '@' + Var('catapult_revision'),
   'src/third_party/colorama/src':
     Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
+  'src/third_party/googletest/src':
+    Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '42bc671f47b122fad36db5eccbc06868afdf7862',
   'src/third_party/libjpeg_turbo':
-    Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '7260e4d8b8e1e40b17f03fafdf1cd83296900f76',
+    Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'a1750dbc79a8792dde3d3f7d7d8ac28ba01ac9dd',
   'src/third_party/yasm/source/patched-yasm':
     Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a',
   'src/tools':
-    Var('chromium_git') + '/chromium/src/tools' + '@' + '5c327d115e2022cbeb2e8f51f3a0b4dbcb1dd451',
+    Var('chromium_git') + '/chromium/src/tools' + '@' + 'b8af3bf606479e3cca4af19a1c576a3162806160',
   'src/tools/gyp':
     Var('chromium_git') + '/external/gyp.git' + '@' + 'eb296f67da078ec01f5e3a9ea9cdc6d26d680161',
    'src/tools/swarming_client':
@@ -52,13 +50,13 @@ deps = {
 deps_os = {
   'android': {
     'src/base':
-      Var('chromium_git') + '/chromium/src/base' + '@' + 'f6489f4fd2be9f4245492fd4a708740bba073f13',
+      Var('chromium_git') + '/chromium/src/base' + '@' + '7830ef61f5f7a76c211b5e963a58d18fce2bc58f',
     'src/third_party/android_tools':
-      Var('chromium_git') + '/android_tools.git' + '@' + 'b65c4776dac2cf1b80e969b3b2d4e081b9c84f29',
+      Var('chromium_git') + '/android_tools.git' + '@' + '023e2f65409a2b7886b8d644d6a88542ead6cd0a',
     'src/third_party/ced/src':
-      Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + 'e21eb6aed10b9f6e2727f136c52420033214d458',
+      Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + '910cca22d881b02cbc8950fa02ccbcdcfb782456',
     'src/third_party/icu':
-      Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'b34251f8b762f8e2112a89c587855ca4297fed96',
+      Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'dfa798fe694702b43a3debc3290761f22b1acaf8',
     'src/third_party/jsr-305/src':
       Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919',
     'src/third_party/junit/src':
@@ -71,10 +69,12 @@ deps_os = {
       Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4',
     'src/third_party/robolectric/robolectric':
       Var('chromium_git') + '/external/robolectric.git' + '@' + '2a0b6ba221c14f3371813a676ce06143353e448d',
+    'src/third_party/ub-uiautomator/lib':
+      Var('chromium_git') + '/chromium/third_party/ub-uiautomator.git' + '@' + '00270549ce3161ae72ceb24712618ea28b4f9434',
   },
   'ios': {
     'src/ios':
-      Var('chromium_git') + '/chromium/src/ios' + '@' + '9595ed7ed6ab7bcb3b1f990a4455f56d6ed01ef3',
+      Var('chromium_git') + '/chromium/src/ios' + '@' + '4243f190b318065a3cb6ff3c4acb97d1b56dbf87',
   },
   'unix': {
     'src/third_party/lss':
@@ -271,6 +271,16 @@ hooks = [
                '-l', 'third_party/sqlite4java'
     ],
   },
+  {
+    'name': 'xstream',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-robolectric',
+               '-l', 'third_party/xstream'
+    ],
+  },
   {
     'name': 'objenesis',
     'pattern': '.',
@@ -424,13 +434,6 @@ hooks = [
                 '-d', 'src/tools/luci-go/linux64',
     ],
   },
-  {
-    'name': 'clang_format_merge_driver',
-    'pattern': '.',
-    'action': [ 'python',
-                'src/tools/clang_format_merge_driver/install_git_hook.py',
-    ],
-  },
 ]
 
 recursedeps = [