Revert of Create Monochrome-specific repack() targets

chrome/test/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
@@ skipping 436 matching lines @@
       "$root_out_dir/test_page.css",
       "$root_out_dir/test_page.css.mock-http-headers",
       "$root_out_dir/ui_test.pak",
     ]
     if (is_linux || is_win) {
       data += [
         "$root_out_dir/chrome_100_percent.pak",
         "$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",
       "//chrome/browser",
       "//chrome/browser/devtools",
       "//chrome/renderer",
       "//components/resources",
       "//components/sync",
       "//components/sync:test_support_sync_api",
       "//content/app/resources",
@@ skipping 1068 matching lines @@
       "../browser/importer/firefox_importer_browsertest.cc",
       "../browser/importer/ie_importer_browsertest_win.cc",
       "../browser/importer/importer_unittest_utils.cc",
       "../browser/importer/importer_unittest_utils.h",
       "../browser/infobars/infobars_browsertest.cc",
       "../browser/installable/installable_manager_browsertest.cc",
       "../browser/interstitials/security_interstitial_page_test_utils.cc",
       "../browser/interstitials/security_interstitial_page_test_utils.h",
       "../browser/invalidation/profile_invalidation_provider_factory_browsertest.cc",
       "../browser/lifetime/browser_close_manager_browsertest.cc",
+      "../browser/loadtimes_extension_bindings_browsertest.cc",
       "../browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc",
-      "../browser/loadtimes_extension_bindings_browsertest.cc",
       "../browser/locale_tests_browsertest.cc",
       "../browser/media/defer_background_media_browsertest.cc",
       "../browser/media/encrypted_media_browsertest.cc",
       "../browser/media/encrypted_media_supported_types_browsertest.cc",
       "../browser/media/media_browsertest.cc",
       "../browser/media/media_browsertest.h",
       "../browser/media/test_license_server.cc",
       "../browser/media/test_license_server.h",
       "../browser/media/test_license_server_config.h",
       "../browser/media/webrtc/media_stream_devices_controller_browsertest.cc",
@@ skipping 274 matching lines @@
       "ppapi/ppapi_filechooser_browsertest.cc",
     ]
 
     deps += [
       ":browser_tests_js_webui",
       ":sync_integration_test_support",
       ":test_support_ui",
       "//base:i18n",
       "//base/test:test_support",
       "//chrome:browser_tests_pak",
+      "//chrome:packed_extra_resources",
       "//chrome:packed_resources",
       "//chrome:resources",
       "//chrome:strings",
       "//chrome/browser",
       "//chrome/browser/resources:extension_resource_demo",
       "//chrome/renderer",
       "//components/autofill/content/browser:risk_proto",
       "//components/autofill/content/renderer:test_support",
       "//components/captive_portal:test_support",
       "//components/dom_distiller/content/browser",
@@ skipping 81 matching lines @@
       "$root_out_dir/resources/extension/",
       "$root_out_dir/test_case.html",
       "$root_out_dir/test_case.html.mock-http-headers",
       "$root_out_dir/test_data/",
       "$root_out_dir/test_page.css",
       "$root_out_dir/test_page.css.mock-http-headers",
       "$root_out_dir/test_url_loader_data/",
     ]
 
     if (!is_mac) {
-      data += [
-        "$root_out_dir/locales/",
-        "$root_out_dir/resources.pak",
-      ]
+      data += [ "$root_out_dir/locales/" ]
+      data_deps += [ "//chrome:packed_extra_resources" ]
     }
 
     if (!enable_one_click_signin) {
       sources -= [ "../browser/ui/sync/one_click_signin_links_delegate_impl_browsertest.cc" ]
     }
     if (enable_nacl) {
       sources += [
         "../browser/chrome_service_worker_browsertest.cc",
         "../browser/extensions/extension_nacl_browsertest.cc",
         "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc",
@@ skipping 439 matching lines @@
         "../browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc",
         "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc",
         "../browser/ui/ash/shelf_browsertest.cc",
       ]
 
       if (toolkit_views) {
         sources -= [ "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc" ]
       }
     }
     if (is_mac) {
-      # Other platforms only need .pak files, and can build this target
-      # standalone much faster.
+      # Other platforms only need {packed_extra_resources,packed_resources},
+      # and can build this target standalone much faster.
       deps += [
         "//chrome",
         "//chrome/common:app_mode_app_support",
 
         # TODO(GYP) Mac: GYP has this dependency. Uncommenting this line
         # generates duplicate symbols between
         #   obj/components/crash/content/app/breakpad_stubs/crash_reporter_client.o
         #   obj/components/crash/content/app/lib/crash_reporter_client.o
         # It's not clear how this is supposed to work. The intent seems to be
         # to not link breakpad in the tests. The dependency on .../app:lib
@@ skipping 283 matching lines @@
       "//third_party/pywebsocket/",
       "//third_party/tlslite/",
       "$root_out_dir/pyproto/",
     ]
 
     if (is_linux || is_win) {
       data += [
         "$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",
       ]
     }
 
     # TODO(phajdan.jr): Only temporary, to make transition easier.
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
     deps = [
       ":browser_tests_runner",
       ":sync_integration_test_support",
       ":test_support",
       ":test_support_ui",
+      "//chrome:packed_extra_resources",
       "//chrome:packed_resources",
       "//chrome:resources",
       "//chrome:strings",
       "//chrome/app:chrome_dll_resources",
       "//chrome/app:command_ids",
       "//chrome/common",
       "//chrome/renderer",
       "//components/sync",
       "//crypto:platform",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/WebKit/public:blink",
       "//third_party/icu",
       "//third_party/leveldatabase",
     ]
 
     data_deps = [
       "//third_party/mesa:osmesa",
     ]
 
+    if (!is_mac) {
+      data_deps += [ "//chrome:packed_extra_resources" ]
+    }
+
     if (is_mac) {
       # Dictionary sync is disabled on Mac.
       sources -= [
         "../browser/sync/test/integration/single_client_dictionary_sync_test.cc",
         "../browser/sync/test/integration/two_client_dictionary_sync_test.cc",
       ]
 
       data_deps += [
         "//chrome",
         "//chrome:chrome_framework",
@@ skipping 585 matching lines @@
     "//third_party/pywebsocket/",
     "//third_party/tlslite/",
     "//third_party/zlib/google/test/data/",
     "//tools/metrics/histograms/histograms.xml",
     "$root_out_dir/pyproto/google/",
   ]
   if (is_android || is_linux || is_win) {
     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) {
     data += [ "$root_out_dir/chrome_200_percent.pak" ]
   }
 
   defines = []
 
   deps = [
     # NOTE: New dependencies should generally be added in the OS!="ios"
@@ skipping 67 matching lines @@
       "//third_party/webrtc/modules/desktop_capture",
       "//tools/json_schema_compiler/test:schema_test",
       "//ui/gl",
       "//v8",
     ]
   }
 
   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) {
     # Offline pages are currently only on Android.
     sources += [
       "../browser/android/offline_pages/offline_page_mhtml_archiver_unittest.cc",
       "../browser/android/offline_pages/offline_page_request_job_unittest.cc",
       "../browser/android/offline_pages/offline_page_utils_unittest.cc",
       "../browser/android/offline_pages/prerender_adapter_unittest.cc",
       "../browser/android/offline_pages/prerendering_loader_unittest.cc",
@@ skipping 1107 matching lines @@
       "../browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc",
       "../browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc",
       "../browser/password_manager/account_chooser_dialog_android_unittest.cc",
       "../browser/password_manager/auto_signin_first_run_dialog_android_unittest.cc",
       "../browser/password_manager/save_password_infobar_delegate_android_unittest.cc",
       "../browser/permissions/permission_queue_controller_unittest.cc",
     ]
   }
   if (!is_mac && !is_ios) {
     deps += [
+      "//chrome:packed_extra_resources",
       "//chrome:packed_resources",
       "//chrome/tools/convert_dict:lib",
       "//third_party/hunspell",
     ]
   }
   if (is_win || is_mac) {
     sources += [
       "../browser/media_galleries/fileapi/itunes_file_util_unittest.cc",
       "../browser/media_galleries/fileapi/picasa_file_util_unittest.cc",
       "../utility/media_galleries/itunes_library_parser_unittest.cc",
@@ skipping 412 matching lines @@
       "touch_hud",
       "ui",
     ]
 
     if (is_linux && !is_android) {
       deps += [ "//components/font_service:manifest" ]
       packaged_services += [ "font_service" ]
     }
   }
 }