From 76f48222c95e7b00885ab775b95c7eb501ba665d Mon Sep 17 00:00:00 2001
From: dpranke <dpranke@chromium.org>
Date: Tue, 31 Mar 2015 17:00:00 -0700
Subject: Add performance_tests_browser to the GN build.

R=brettw@chromium.org
BUG=461019
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg

Review URL: https://codereview.chromium.org/1045133002

Cr-Commit-Position: refs/heads/master@{#323145}
---
 BUILD.gn                |  1 +
 build/gn_migration.gypi |  3 +-
 chrome/test/BUILD.gn    | 73 +++++++++++++++++++++++++++----------------------
 3 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index d4406ce..3c085e1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -252,6 +252,7 @@ group("gn_all") {
       "//cc:cc_perftests",
       "//chrome/test:chrome_app_unittests",
       "//chrome/test:load_library_perf_tests",
+      "//chrome/test:performance_browser_tests",
       "//chrome/test:sync_performance_tests",
       "//chrome/test/chromedriver:chromedriver",
       "//chrome/test/chromedriver:chromedriver_tests",
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index fa00f92..6201bd7 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -56,6 +56,7 @@
         '../chrome/chrome.gyp:chromedriver_unittests',
         '../chrome/chrome.gyp:interactive_ui_tests',
         '../chrome/chrome.gyp:load_library_perf_tests',
+        '../chrome/chrome.gyp:performance_browser_tests',
         '../chrome/chrome.gyp:service_discovery_sniffer',
         '../chrome/chrome.gyp:sync_integration_tests',
         '../chrome/chrome.gyp:sync_performance_tests',
@@ -293,6 +294,7 @@
             '../chrome/chrome.gyp:chromedriver',
             '../chrome/chrome.gyp:chromedriver_unitests',
             '../chrome/chrome.gyp:interactive_ui_tests',
+            '../chrome/chrome.gyp:performance_browser_tests',
             '../chrome/chrome.gyp:sync_integration_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../extensions/extensions_tests.gyp:extensions_browsertests',
@@ -415,7 +417,6 @@
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
-            '../chrome/chrome.gyp:performance_browser_tests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../third_party/webrtc/tools/tools.gyp:frame_analyzer',
             '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
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" ]
+      }
+    }
   }
 }
-- 
cgit v1.1