Roll Chromium 238260 -> 243863

R=andrew@webrtc.org, henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6939004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5385 4adac7df-926f-26a2-2b94-8c16560cd09d

.gitignore

@@ -29,6 +29,7 @@
 .cproject
 .gdb_history
 .gdbinit
+.gn
 .metadata
 .project
 .pydevproject
@@ -36,6 +37,7 @@
 /Makefile
 /build
 /chromium_deps
+/chromium_gn
 /google_apis/build
 /gyp-mac-tool
 /net/third_party/nss/

BUILD.gn

@@ -0,0 +1,16 @@
+# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+# This file is copied and modified from Chromium (src/BUILD.gn).
+
+group("root") {
+  external = true
+
+  deps = [
+  ]
+}

DEPS

@@ -11,7 +11,7 @@ vars = {
   "googlecode_url": "http://%s.googlecode.com/svn",
   "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
-  "chromium_revision": "238260",
+  "chromium_revision": "243863",
 
   # A small subset of WebKit is needed for the Android Python test framework.
   "webkit_trunk": "http://src.chromium.org/blink/trunk",
@@ -23,6 +23,9 @@ deps = {
   "../chromium_deps":
     File(Var("chromium_trunk") + "/src/DEPS@" + Var("chromium_revision")),
 
+  "../chromium_gn":
+    File(Var("chromium_trunk") + "/src/.gn@" + Var("chromium_revision")),
+
   "build":
     Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
 
@@ -95,6 +98,9 @@ deps = {
   "tools/clang":
     Var("chromium_trunk") + "/src/tools/clang@" + Var("chromium_revision"),
 
+  "tools/gn":
+    Var("chromium_trunk") + "/src/tools/gn@" + Var("chromium_revision"),
+
   "tools/gyp":
     From("chromium_deps", "src/tools/gyp"),
 
@@ -194,6 +200,59 @@ deps_os = {
 }
 
 hooks = [
+  {
+    # Copy .gn from temporary place (../chromium_gn) to root_dir.
+    "name": "copy .gn",
+    "pattern": ".",
+    "action": ["python", Var("root_dir") + "/build/cp.py",
+               Var("root_dir") + "/../chromium_gn/.gn",
+               Var("root_dir")],
+  },
+  # Pull GN binaries. This needs to be before running GYP below.
+  {
+    "name": "gn_win",
+    "pattern": "tools/gn/bin/win/gn.exe.sha1",
+    "action": [ "download_from_google_storage",
+                "--no_resume",
+                "--platform=win32",
+                "--no_auth",
+                "--bucket", "chromium-gn",
+                "-s", Var("root_dir") + "/tools/gn/bin/win/gn.exe.sha1",
+    ],
+  },
+  {
+    "name": "gn_mac",
+    "pattern": "tools/gn/bin/mac/gn.sha1",
+    "action": [ "download_from_google_storage",
+                "--no_resume",
+                "--platform=darwin",
+                "--no_auth",
+                "--bucket", "chromium-gn",
+                "-s", Var("root_dir") + "/tools/gn/bin/mac/gn.sha1",
+    ],
+  },
+  {
+    "name": "gn_linux",
+    "pattern": "tools/gn/bin/linux/gn.sha1",
+    "action": [ "download_from_google_storage",
+                "--no_resume",
+                "--platform=linux*",
+                "--no_auth",
+                "--bucket", "chromium-gn",
+                "-s", Var("root_dir") + "/tools/gn/bin/linux/gn.sha1",
+    ],
+  },
+  {
+    "name": "gn_linux32",
+    "pattern": "tools/gn/bin/linux/gn32.sha1",
+    "action": [ "download_from_google_storage",
+                "--no_resume",
+                "--platform=linux*",
+                "--no_auth",
+                "--bucket", "chromium-gn",
+                "-s", Var("root_dir") + "/tools/gn/bin/linux/gn32.sha1",
+    ],
+  },
   {
     # Create a supplement.gypi file under trunk/webrtc. This file will be picked
     # up by gyp and used to enable the standalone build.

talk/build/isolate.gypi

@@ -106,8 +106,8 @@
             # Other variables should use the -V FOO=<(FOO) form so frequent
             # values, like '0' or '1', aren't stripped out by GYP.
             '--outdir', '<(PRODUCT_DIR)/ ',
-            '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
+            '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
-            '--variable', 'OS=<(OS)',
+            '--config-variable', 'OS=<(OS)',
             '--result', '<@(_outputs)',
             '--isolate', '<(RULE_INPUT_PATH)',
           ],
@@ -118,8 +118,8 @@
             '<(test_isolation_mode)',
             '--outdir', '<(test_isolation_outdir)',
             # See comment above.
-            '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
+            '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
-            '--variable', 'OS=<(OS)',
+            '--config-variable', 'OS=<(OS)',
             '--result', '<@(_outputs)',
             '--isolate', '<(RULE_INPUT_PATH)',
           ],

tools/valgrind-webrtc/webrtc_tests.py

@@ -114,6 +114,10 @@ def main(_):
                           'instead of /tmp.\nThis can be useful for tool '
                           'developers/maintainers.\nPlease note that the <tool>'
                           '.logs directory will be clobbered on tool startup.'))
+  parser.add_option("--brave-new-test-launcher", action="store_true",
+                    help="run the tests with --brave-new-test-launcher")
+  parser.add_option("--test-launcher-bot-mode", action="store_true",
+                    help="run the tests with --test-launcher-bot-mode")
   options, args = parser.parse_args()
 
   if options.verbose:

webrtc/build/isolate.gypi

@@ -87,8 +87,8 @@
             # Other variables should use the -V FOO=<(FOO) form so frequent
             # values, like '0' or '1', aren't stripped out by GYP.
             '--outdir', '<(PRODUCT_DIR)/ ',
-            '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
+            '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
-            '--variable', 'OS=<(OS)',
+            '--config-variable', 'OS=<(OS)',
             '--result', '<@(_outputs)',
             '--isolate', '<(RULE_INPUT_PATH)',
           ],
@@ -99,8 +99,8 @@
             '<(test_isolation_mode)',
             '--outdir', '<(test_isolation_outdir)',
             # See comment above.
-            '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
+            '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
-            '--variable', 'OS=<(OS)',
+            '--config-variable', 'OS=<(OS)',
             '--result', '<@(_outputs)',
             '--isolate', '<(RULE_INPUT_PATH)',
           ],

webrtc/video_engine/test/auto_test/vie_auto_test.isolate

@@ -31,7 +31,7 @@
           '<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarming_client/',
+          '../../../../tools/swarming_client/',
         ],
       },
     }],