Merge from Chromium at DEPS revision r215849

This commit was generated by merge_to_master.py.

Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4

8 files changed, 21 insertions, 19 deletions

diff --git a/build/all.gyp b/build/all.gyp
index a10e93d0d8..865bb18bb4 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -148,7 +148,6 @@
             '../sandbox/sandbox.gyp:*',
             '../third_party/angle_dx11/src/build_angle.gyp:*',
             '../third_party/bspatch/bspatch.gyp:*',
-            '../third_party/gles2_book/gles2_book.gyp:*',
           ],
         }, {
           'dependencies': [
diff --git a/build/android/pylib/gtest/filter/content_browsertests_disabled b/build/android/pylib/gtest/filter/content_browsertests_disabled
index 565f03062a..e4821aa3d4 100644
--- a/build/android/pylib/gtest/filter/content_browsertests_disabled
+++ b/build/android/pylib/gtest/filter/content_browsertests_disabled
@@ -6,6 +6,7 @@ ExternalClearKey/EncryptedMediaTest.*
 ClearKey/EncryptedMediaTest.*
 WorkerTest.*
 MediaTest.*
+MediaSourceTest.*
 WebGLConformanceTest.*
 MessagePortTest.Tests
 EncryptedMediaTest.*
@@ -13,6 +14,9 @@ CrossPlatformAccessibilityBrowserTest.*
 DatabaseTest.*
 ResourceDispatcherHostBrowserTest.SyncXMLHttpRequest_DuringUnload
 
+# Crashes
+ResourceDispatcherHostBrowserTest.CrossSiteAfterCrash
+
 # Failures
 RenderViewHostTest.BaseURLParam
 OffTheRecordClipboardTest.ClearContentData
@@ -88,10 +92,6 @@ IndexedDBBrowserTestWithVersion987654SSVData.DestroyTest
 IndexedDBBrowserTestWithCorruptLevelDB.DestroyTest
 
 BookmarkletTest.NonEmptyResult
-MediaSourceTest.Playback_AudioOnly_WebM
-MediaSourceTest.Playback_VideoAudio_WebM
-MediaSourceTest.Playback_VideoOnly_WebM
-MediaSourceTest.ConfigChangeVideo
 
 # http://crbug.com/248796
 ResourceFetcherTests.ResourceFetcher404
diff --git a/build/android/run_browser_tests.py b/build/android/run_browser_tests.py
index 6f6003dcbc..c536a2991e 100755
--- a/build/android/run_browser_tests.py
+++ b/build/android/run_browser_tests.py
@@ -14,11 +14,10 @@ from pylib import cmd_helper
 
 
 if __name__ == '__main__':
-  args = ['python',
-          os.path.join(os.path.dirname(__file__), 'test_runner.py'),
+  args = [os.path.join(os.path.dirname(__file__), 'test_runner.py'),
           'gtest', '-s', 'content_browsertests'] + sys.argv[1:]
   logging.warning('*' * 80)
   logging.warning('This script is deprecated and will be removed soon.')
   logging.warning('Use the following instead: %s', ' '.join(args))
   logging.warning('*' * 80)
-  sys.exit(cmd_helper.RunCmd(args))
+  sys.exit(1)
diff --git a/build/android/run_instrumentation_tests.py b/build/android/run_instrumentation_tests.py
index c1a4ef0d26..7a9fa1ec81 100755
--- a/build/android/run_instrumentation_tests.py
+++ b/build/android/run_instrumentation_tests.py
@@ -14,11 +14,10 @@ from pylib import cmd_helper
 
 
 if __name__ == '__main__':
-  args = ['python',
-          os.path.join(os.path.dirname(__file__), 'test_runner.py'),
+  args = [os.path.join(os.path.dirname(__file__), 'test_runner.py'),
           'instrumentation'] + sys.argv[1:]
   logging.warning('*' * 80)
   logging.warning('This script is deprecated and will be removed soon.')
   logging.warning('Use the following instead: %s', ' '.join(args))
   logging.warning('*' * 80)
-  sys.exit(cmd_helper.RunCmd(args))
+  sys.exit(1)
diff --git a/build/android/run_tests.py b/build/android/run_tests.py
index dbb0832719..59118cf3b2 100755
--- a/build/android/run_tests.py
+++ b/build/android/run_tests.py
@@ -14,11 +14,10 @@ from pylib import cmd_helper
 
 
 if __name__ == '__main__':
-  args = ['python',
-          os.path.join(os.path.dirname(__file__), 'test_runner.py'),
+  args = [os.path.join(os.path.dirname(__file__), 'test_runner.py'),
           'gtest'] + sys.argv[1:]
   logging.warning('*' * 80)
   logging.warning('This script is deprecated and will be removed soon.')
   logging.warning('Use the following instead: %s', ' '.join(args))
   logging.warning('*' * 80)
-  sys.exit(cmd_helper.RunCmd(args))
+  sys.exit(1)
diff --git a/build/common.gypi b/build/common.gypi
index 7cbe6b206c..0d20ba9a93 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -848,9 +848,6 @@
     'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
     'enable_mdns%' : '<(enable_mdns)',
 
-    # Use system mesa instead of bundled one.
-    'use_system_mesa%': 0,
-
     # Use system nspr instead of the bundled one.
     'use_system_nspr%': 0,
 
@@ -1414,6 +1411,12 @@
       }],  # OS=="mac" or OS=="ios"
       ['OS=="win"', {
         'conditions': [
+          # This is the architecture convention used in WinSDK paths.
+          ['target_arch=="ia32"', {
+            'winsdk_arch%': 'x86',
+          },{
+            'winsdk_arch%': '<(target_arch)',
+          }],
           ['component=="shared_library"', {
             'win_use_allocator_shim%': 0,
           }],
@@ -4541,6 +4544,9 @@
                   ['asan==0', {
                     'AdditionalOptions': ['/largeaddressaware'],
                   }],
+                  ['clang==1', {
+                    'AdditionalOptions!': ['/safeseh'],
+                  }],
                 ],
               },
             },
diff --git a/build/util/LASTCHANGE b/build/util/LASTCHANGE
index b5492d44ed..d510e32e56 100644
--- a/build/util/LASTCHANGE
+++ b/build/util/LASTCHANGE
@@ -1 +1 @@
-LASTCHANGE=215573
+LASTCHANGE=215849
diff --git a/build/util/LASTCHANGE.blink b/build/util/LASTCHANGE.blink
index 2b420702cd..9b86047f19 100644
--- a/build/util/LASTCHANGE.blink
+++ b/build/util/LASTCHANGE.blink
@@ -1 +1 @@
-LASTCHANGE=155496
+LASTCHANGE=155530