Remove chrome.pak references, build resources into resources.pak

chrome/chrome_repack_resources.gypi

Index: chrome/chrome_repack_resources.gypi
diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi
index 8519aabd4469d8b9f8568af5d208d45a300bfcb6..7480c2dd500b6bd13f800eb0fd829249d8405124 100644
--- a/chrome/chrome_repack_resources.gypi
+++ b/chrome/chrome_repack_resources.gypi
@@ -5,14 +5,26 @@
   'action_name': 'repack_resources',
   'variables': {
     'pak_inputs': [
+      '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
+      '<(grit_out_dir)/browser_resources.pak',
+      '<(grit_out_dir)/common_resources.pak',
       '<(grit_out_dir)/memory_internals_resources.pak',
       '<(grit_out_dir)/net_internals_resources.pak',
       '<(grit_out_dir)/signin_internals_resources.pak',
       '<(grit_out_dir)/sync_internals_resources.pak',
       '<(grit_out_dir)/translate_internals_resources.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
     ],
     'conditions': [
+      ['OS != "ios"', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
+          '<(grit_out_dir)/devtools_discovery_page_resources.pak',
+        ],
+      }],
       ['OS != "ios" and OS != "android"', {
         # New paks should be added here by default.
         'pak_inputs': [
@@ -23,9 +35,9 @@
           '<(grit_out_dir)/sync_file_system_internals_resources.pak',
         ],
       }],
-      ['OS != "ios"', {
+      ['enable_extensions==1', {
         'pak_inputs': [
-          '<(grit_out_dir)/devtools_discovery_page_resources.pak',
+          '<(grit_out_dir)/extensions_api_resources.pak',
         ],
       }],
     ],