1 files changed, 40 insertions, 33 deletions
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 0eb16d4..619cf92 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1713,38 +1713,45 @@ if (!is_android) {
         deps += [ "//third_party/cld_2:cld2_platform_impl" ]
       }
     }
-    # TODO(GYP): Finish me...
-    # source_set("performance_browser_tests") {
-    #   testonly = true
-    #   sources =
-    #     rebase_path(chrome_tests_gypi_values.performance_browser_tests_sources,
-    #                 ".",
-    #                 "//chrome")
-    #   deps = [
-    #     ":perf",
-    #     ":test_support",
-    #     "//base",
-    #     "//base:i18n",
-    #     "//base/test:test_support",
-    #     "//chrome/browser",
-    #     "//chrome/renderer",
-    #     "//media/cast:cast_test_utility",
-    #     "//testing/gtest",
-    #   ]
-    #
-    #   if (!is_win) {
-    #     sources -= [
-    #       "../app/chrome_command_ids.h",
-    #       # "../app/chrome_dll.rc",
-    #       #"../app/chrome_dll_resource.h",
-    #       #"../app/chrome_version.rc.version",
-    #     ]
-    #   }
-    #   if (!is_mac) {
-    #     sources -= [
-    #       "perf/mach_ports_performancetest.cc",
-    #     ]
-    #   }
-    # }
+
+    test("performance_browser_tests") {
+      sources = rebase_path(
+              chrome_tests_gypi_values.performance_browser_tests_sources,
+              ".",
+              "//chrome")
+
+      defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+
+      deps = [
+        ":test_support",
+        "//base",
+        "//base:i18n",
+        "//base/test:test_support",
+        "//chrome/browser",
+        "//chrome/renderer",
+        "//media/cast:test_support",
+        "//testing/gtest",
+        "//testing/perf",
+      ]
+
+      if (!is_win) {
+        sources -= [
+          "../app/chrome_command_ids.h",
+
+          #"../app/chrome_dll.rc",
+          #"../app/chrome_dll_resource.h",
+          "../app/chrome_version.rc.version",
+        ]
+      }
+      if (!is_mac) {
+        sources -= [ "perf/mach_ports_performancetest.cc" ]
+      }
+
+      if (cld_version == 0 || cld_version == 2) {
+        # Use whatever CLD2 data access mode that the
+        # application embedder is using.
+        deps += [ "//third_party/cld_2:cld2_platform_impl" ]
+      }
+    }
   }
 }