Roll chromium_revision 61ed337cfe..21934f358a (388120:388405)

build_overrides/gtest.gni

Index: build_overrides/gtest.gni
diff --git a/BUILD.gn b/build_overrides/gtest.gni
similarity index 54%
copy from BUILD.gn
copy to build_overrides/gtest.gni
index b7f7a0619a9a73591c070aee611224ec6a544f79..a64bb7ed5b00bc67a1de52002e0a6dd2cfddda24 100644
--- a/BUILD.gn
+++ b/build_overrides/gtest.gni
@@ -1,4 +1,4 @@
-# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+# Copyright (c) 2016 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
@@ -6,9 +6,8 @@
 # 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") {
-  deps = [
-    "//webrtc",
-  ]
-}
+# Include support for registering main function in multi-process tests.
+gtest_include_multiprocess = true
+
+# Include support for platform-specific operations across unit tests.
+gtest_include_platform_test = true