BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1

Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

6 files changed, 52 insertions, 59 deletions

diff --git a/chromium/android_webview/android_webview.gyp b/chromium/android_webview/android_webview.gyp
index 0ac4b8650ff..1c79e44c5d6 100644
--- a/chromium/android_webview/android_webview.gyp
+++ b/chromium/android_webview/android_webview.gyp
@@ -246,7 +246,6 @@
         '../content/content.gyp:content_app_both',
         '../content/content.gyp:content_browser',
         '../gin/gin.gyp:gin',
-        '../gpu/blink/gpu_blink.gyp:gpu_blink',
         '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
         '../gpu/gpu.gyp:command_buffer_service',
         '../gpu/gpu.gyp:gl_in_process_context',
@@ -261,9 +260,10 @@
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/events/events.gyp:gesture_detection',
         '../ui/gl/gl.gyp:gl',
+        '../ui/gl/init/gl_init.gyp:gl_init',
         '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
         '../url/ipc/url_ipc.gyp:url_ipc',
-        '../v8/tools/gyp/v8.gyp:v8',
+        '../v8/src/v8.gyp:v8',
         'android_webview_pak',
         'android_webview_version',
         '../components/components.gyp:pref_registry',
@@ -313,8 +313,6 @@
         'browser/aw_metrics_service_client.h',
         'browser/aw_permission_manager.cc',
         'browser/aw_permission_manager.h',
-        'browser/aw_pref_store.cc',
-        'browser/aw_pref_store.h',
         'browser/aw_print_manager.cc',
         'browser/aw_print_manager.h',
         'browser/aw_printing_message_filter.cc',
@@ -406,6 +404,8 @@
         'common/url_constants.h',
         'crash_reporter/aw_microdump_crash_reporter.cc',
         'crash_reporter/aw_microdump_crash_reporter.h',
+        'gpu/aw_content_gpu_client.cc',
+        'gpu/aw_content_gpu_client.h',
         'lib/aw_browser_dependency_factory_impl.cc',
         'lib/aw_browser_dependency_factory_impl.h',
         'lib/main/aw_main_delegate.cc',
@@ -425,8 +425,8 @@
         'renderer/aw_print_web_view_helper_delegate.h',
         'renderer/aw_render_frame_ext.cc',
         'renderer/aw_render_frame_ext.h',
-        'renderer/aw_render_process_observer.cc',
-        'renderer/aw_render_process_observer.h',
+        'renderer/aw_render_thread_observer.cc',
+        'renderer/aw_render_thread_observer.h',
         'renderer/aw_render_view_ext.cc',
         'renderer/aw_render_view_ext.h',
         'renderer/print_render_frame_observer.cc',
diff --git a/chromium/android_webview/android_webview_test_apk.isolate b/chromium/android_webview/android_webview_test_apk.isolate
index 7436aca18b9..630854e4c7e 100644
--- a/chromium/android_webview/android_webview_test_apk.isolate
+++ b/chromium/android_webview/android_webview_test_apk.isolate
@@ -1,14 +1,28 @@
-# Copyright (c) 2014 The Chromium Authors. All rights reserved.
+# Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
-  'conditions': [
-    ['OS=="android"', {
-      'variables': {
-        'files': [
-          '<(DEPTH)/android_webview/test/data/',
-        ],
-      },
-    }],
+  'includes': [
+    '../build/android/android.isolate',
   ],
+  'variables': {
+    'command': [
+      '<(PRODUCT_DIR)/bin/run_android_webview_test_apk',
+      '--enable-platform-mode',
+      '-e', 'local',
+      '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
+    ],
+    'files': [
+      '../third_party/proguard/lib/proguard.jar',
+      '<(PRODUCT_DIR)/host_forwarder',
+      '<(PRODUCT_DIR)/forwarder_dist/',
+      '<(PRODUCT_DIR)/android_webview_test_apk/',
+      '<(PRODUCT_DIR)/apks/AndroidWebView.apk',
+      '<(PRODUCT_DIR)/apks/AndroidWebViewTest.apk',
+      '<(PRODUCT_DIR)/bin/run_android_webview_test_apk',
+      '<(PRODUCT_DIR)/test.lib.java/AndroidWebViewTest.jar',
+      'android_webview_test_data.isolate',
+      'test/data/',
+    ]
+  },
 }
diff --git a/chromium/android_webview/android_webview_test_apk_run.isolate b/chromium/android_webview/android_webview_test_apk_run.isolate
deleted file mode 100644
index eb2fdaa44da..00000000000
--- a/chromium/android_webview/android_webview_test_apk_run.isolate
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
-  'includes': [
-    '../build/android/android.isolate',
-  ],
-  'variables': {
-    'command': [
-      '<(PRODUCT_DIR)/bin/run_android_webview_test_apk',
-      '--enable-platform-mode',
-      '-e', 'local',
-      '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
-    ],
-    'files': [
-      '../third_party/proguard/lib/proguard.jar',
-      '<(PRODUCT_DIR)/host_forwarder',
-      '<(PRODUCT_DIR)/forwarder_dist/',
-      '<(PRODUCT_DIR)/android_webview_test_apk/',
-      '<(PRODUCT_DIR)/apks/AndroidWebView.apk',
-      '<(PRODUCT_DIR)/apks/AndroidWebViewTest.apk',
-      '<(PRODUCT_DIR)/bin/run_android_webview_test_apk',
-      '<(PRODUCT_DIR)/test.lib.java/AndroidWebViewTest.jar',
-      'android_webview_test_apk.isolate',
-      'test/data/',
-    ]
-  },
-}
diff --git a/chromium/android_webview/android_webview_test_data.isolate b/chromium/android_webview/android_webview_test_data.isolate
new file mode 100644
index 00000000000..18a58252883
--- /dev/null
+++ b/chromium/android_webview/android_webview_test_data.isolate
@@ -0,0 +1,10 @@
+# Copyright (c) 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'variables': {
+    'files': [
+      '<(DEPTH)/android_webview/test/data/',
+    ],
+  },
+}
diff --git a/chromium/android_webview/android_webview_tests.gypi b/chromium/android_webview/android_webview_tests.gypi
index d903882b5cc..5e3b96261c3 100644
--- a/chromium/android_webview/android_webview_tests.gypi
+++ b/chromium/android_webview/android_webview_tests.gypi
@@ -116,7 +116,7 @@
         'java_in_dir': '../android_webview/javatests',
         'is_test_apk': 1,
         'test_type': 'instrumentation',
-        'isolate_file': 'android_webview_test_apk.isolate',
+        'isolate_file': 'android_webview_test_data.isolate',
       },
       'includes': [
         '../build/java_apk.gypi',
@@ -136,6 +136,7 @@
         '../testing/gtest.gyp:gtest',
         '../ui/base/ui_base.gyp:ui_base_jni_headers',
         '../ui/gl/gl.gyp:gl',
+        '../ui/gl/init/gl_init.gyp:gl_init',
         '../ui/gl/gl.gyp:gl_test_support',
         'android_webview_common',
         'android_webview_unittests_jni',
@@ -256,7 +257,7 @@
               '../build/isolate.gypi',
             ],
             'sources': [
-              'android_webview_test_apk_run.isolate',
+              'android_webview_test_apk.isolate',
             ],
           },
           {
diff --git a/chromium/android_webview/system_webview_shell_test_apk.isolate b/chromium/android_webview/system_webview_shell_test_apk.isolate
index 15f2a848974..dbea4bdd325 100644
--- a/chromium/android_webview/system_webview_shell_test_apk.isolate
+++ b/chromium/android_webview/system_webview_shell_test_apk.isolate
@@ -3,17 +3,13 @@
 # found in the LICENSE file.
 
 {
-  'conditions': [
-    ['OS=="android"', {
-      'variables': {
-        'files': [
-          '<(DEPTH)/android_webview/tools/system_webview_shell/test/data/',
-          '<(DEPTH)/third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt',
-          '<(DEPTH)/third_party/WebKit/LayoutTests/webexposed/global-interface-listing.html',
-          '<(DEPTH)/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt',
-          '<(DEPTH)/third_party/WebKit/LayoutTests/webexposed/resources/global-interface-listing.js',
-        ],
-      },
-    }],
-  ],
-}
\ No newline at end of file
+  'variables': {
+    'files': [
+      '<(DEPTH)/android_webview/tools/system_webview_shell/test/data/',
+      '<(DEPTH)/third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt',
+      '<(DEPTH)/third_party/WebKit/LayoutTests/webexposed/global-interface-listing.html',
+      '<(DEPTH)/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt',
+      '<(DEPTH)/third_party/WebKit/LayoutTests/webexposed/resources/global-interface-listing.js',
+    ],
+  },
+}