Create Monochrome-specific repack() targets

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 3d617f4c6e5adbd5c9d0c1f5700ec4972341ea2f..b197289000713d5ac85ffde2913a284d6821b6c5 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -454,23 +454,19 @@ if (!is_android) {
         "$root_out_dir/chrome_200_percent.pak",
         "$root_out_dir/locales/en-US.pak",
         "$root_out_dir/locales/fr.pak",
+        "$root_out_dir/resources.pak",
       ]
     }
     if (is_linux) {
       data += [ "$root_out_dir/libppapi_tests.so" ]
     }
 
-    if (!is_mac) {
-      data_deps += [ "//chrome:packed_extra_resources" ]
-    }
-
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
     ldflags = []
 
     deps = [
       ":test_support",
       ":test_support_ui",
-      "//chrome:packed_extra_resources",
       "//chrome:packed_resources",
       "//chrome:resources",
       "//chrome:strings",
@@ -1855,7 +1851,6 @@ test("browser_tests") {
       "//base:i18n",
       "//base/test:test_support",
       "//chrome:browser_tests_pak",
-      "//chrome:packed_extra_resources",
       "//chrome:packed_resources",
       "//chrome:resources",
       "//chrome:strings",
@@ -2420,8 +2415,8 @@ test("browser_tests") {
       }
     }
     if (is_mac) {
-      # Other platforms only need {packed_extra_resources,packed_resources},
-      # and can build this target standalone much faster.
+      # Other platforms only need .pak files, and can build this target
+      # standalone much faster.
       deps += [
         "//chrome",
         "//chrome/common:app_mode_app_support",
@@ -2725,6 +2720,7 @@ if (!is_android) {
         "$root_out_dir/chrome_100_percent.pak",
         "$root_out_dir/chrome_200_percent.pak",
         "$root_out_dir/locales/en-US.pak",
+        "$root_out_dir/resources.pak",
       ]
     }
 
@@ -2736,7 +2732,6 @@ if (!is_android) {
       ":sync_integration_test_support",
       ":test_support",
       ":test_support_ui",
-      "//chrome:packed_extra_resources",
       "//chrome:packed_resources",
       "//chrome:resources",
       "//chrome:strings",
@@ -2757,10 +2752,6 @@ if (!is_android) {
       "//third_party/mesa:osmesa",
     ]
 
-    if (!is_mac) {
-      data_deps += [ "//chrome:packed_extra_resources" ]
-    }
-
     if (is_mac) {
       # Dictionary sync is disabled on Mac.
       sources -= [
@@ -3366,6 +3357,7 @@ test("unit_tests") {
     data += [
       "$root_out_dir/chrome_100_percent.pak",
       "$root_out_dir/locales/en-US.pak",
+      "$root_out_dir/resources.pak",
     ]
   }
   if (is_linux || is_win) {
@@ -3453,8 +3445,6 @@ test("unit_tests") {
   if (is_mac) {
     data_deps += [ "//chrome:chrome_framework" ]
     data += [ "$root_out_dir/Chromium Framework.framework/" ]
-  } else {
-    data_deps += [ "//chrome:packed_extra_resources" ]
   }
 
   if (is_android) {
@@ -4582,7 +4572,6 @@ test("unit_tests") {
   }
   if (!is_mac && !is_ios) {
     deps += [
-      "//chrome:packed_extra_resources",
       "//chrome:packed_resources",
       "//chrome/tools/convert_dict:lib",
       "//third_party/hunspell",