Roll gtest.

testing/gtest/BUILD.gn

Index: testing/gtest/BUILD.gn
diff --git a/build/secondary/testing/gtest/BUILD.gn b/testing/gtest/BUILD.gn
similarity index 62%
rename from build/secondary/testing/gtest/BUILD.gn
rename to testing/gtest/BUILD.gn
index a03ff7c3dae280f840a1ca125bd5f70cbd0fa0e9..a63a3e052dc579703fa9d86973ec346032c2fe52 100644
--- a/build/secondary/testing/gtest/BUILD.gn
+++ b/testing/gtest/BUILD.gn
@@ -20,7 +20,7 @@ config("gtest_config") {
   ]
 
   # Gtest headers need to be able to find themselves.
-  include_dirs = [ "include" ]
+  include_dirs = [ "../third_party/googletest/googletest/include" ]
 
   if (is_win) {
     cflags = [ "/wd4800" ]  # Unused variable warning.
@@ -60,18 +60,28 @@ config("gtest_direct_config") {
   defines = [ "UNIT_TEST" ]
 }
 
-config("gtest_warnings") {
-  if (is_win && is_clang) {
-    # The Mutex constructor initializer list in gtest-port.cc is incorrectly
-    # ordered. See
-    # https://groups.google.com/d/msg/googletestframework/S5uSV8L2TX8/U1FaTDa6J6sJ.
-    cflags = [ "-Wno-reorder" ]
-  }
-}
-
 static_library("gtest") {
   testonly = true
   sources = [
+    "../third_party/googletest/googletest/include/gtest/gtest-death-test.h",
+    "../third_party/googletest/googletest/include/gtest/gtest-message.h",
+    "../third_party/googletest/googletest/include/gtest/gtest-param-test.h",
+    "../third_party/googletest/googletest/include/gtest/gtest-printers.h",
+    "../third_party/googletest/googletest/include/gtest/gtest-spi.h",
+    "../third_party/googletest/googletest/include/gtest/gtest-test-part.h",
+    "../third_party/googletest/googletest/include/gtest/gtest-typed-test.h",
+    "../third_party/googletest/googletest/include/gtest/gtest.h",
+    "../third_party/googletest/googletest/include/gtest/gtest_pred_impl.h",
+    "../third_party/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h",
+    "../third_party/googletest/googletest/include/gtest/internal/gtest-filepath.h",
+    "../third_party/googletest/googletest/include/gtest/internal/gtest-internal.h",
+    "../third_party/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h",
+    "../third_party/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h",
+    "../third_party/googletest/googletest/include/gtest/internal/gtest-param-util.h",
+    "../third_party/googletest/googletest/include/gtest/internal/gtest-port.h",
+    "../third_party/googletest/googletest/include/gtest/internal/gtest-string.h",
+    "../third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h",
+    "../third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h",
     "include/gtest/gtest-death-test.h",
     "include/gtest/gtest-message.h",
     "include/gtest/gtest-param-test.h",
@@ -93,14 +103,14 @@ static_library("gtest") {
     "include/gtest/internal/gtest-type-util.h",
 
     #"gtest/src/gtest-all.cc",  # Not needed by our build.
-    "src/gtest-death-test.cc",
-    "src/gtest-filepath.cc",
-    "src/gtest-internal-inl.h",
-    "src/gtest-port.cc",
-    "src/gtest-printers.cc",
-    "src/gtest-test-part.cc",
-    "src/gtest-typed-test.cc",
-    "src/gtest.cc",
+    "../third_party/googletest/googletest/src/gtest-death-test.cc",
+    "../third_party/googletest/googletest/src/gtest-filepath.cc",
+    "../third_party/googletest/googletest/src/gtest-internal-inl.h",
+    "../third_party/googletest/googletest/src/gtest-port.cc",
+    "../third_party/googletest/googletest/src/gtest-printers.cc",
+    "../third_party/googletest/googletest/src/gtest-test-part.cc",
+    "../third_party/googletest/googletest/src/gtest-typed-test.cc",
+    "../third_party/googletest/googletest/src/gtest.cc",
   ]
 
   if (gtest_include_multiprocess) {
@@ -135,24 +145,19 @@ static_library("gtest") {
     ]
   }
 
-  include_dirs = [ "." ]
+  include_dirs = [ "../third_party/googletest/googletest" ]
 
   all_dependent_configs = [ ":gtest_config" ]
   public_configs = [ ":gtest_direct_config" ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    "//build/config/compiler:no_chromium_code",
-
-    # Must be after no_chromium_code for warning flags to be ordered correctly.
-    ":gtest_warnings",
-  ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
 }
 
 source_set("gtest_main") {
   testonly = true
   sources = [
-    "src/gtest_main.cc",
+    "../third_party/googletest/googletest/src/gtest_main.cc",
   ]
   deps = [
     ":gtest",