Use output_all_resource_defines=false in some chrome/ grd files.

chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

Index: chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
index ddabb67fc44ed582917f692c2cc1d6f0b1e15ebf..8caa866bbb67dc29c67aa1c7b7f00181df494d4e 100644
--- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
+++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
@@ -67,26 +67,37 @@ bool IsComponentExtensionWhitelisted(const std::string& extension_id) {
 
 bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
   int allowed[] = {
+    // Please keep the list in alphabetical order.
     IDR_BOOKMARKS_MANIFEST,
+#if defined(ENABLE_APP_LIST)
     IDR_CHROME_APP_MANIFEST,
+#endif
     IDR_CLOUDPRINT_MANIFEST,
-    IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST,
     IDR_CRYPTOTOKEN_MANIFEST,
     IDR_FEEDBACK_MANIFEST,
     IDR_GAIA_AUTH_MANIFEST,
+#if defined(ENABLE_GOOGLE_NOW)
     IDR_GOOGLE_NOW_MANIFEST,
+#endif
+#if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
     IDR_HANGOUT_SERVICES_MANIFEST,
+#endif
+#if defined(ENABLE_HOTWORDING)
     IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST,
     IDR_HOTWORD_MANIFEST,
+#endif
     IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST,
-    IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST,
-    IDR_SETTINGS_APP_MANIFEST,
-    IDR_WALLPAPERMANAGER_MANIFEST,
-    IDR_WEBSTORE_MANIFEST,
 #if defined(IMAGE_LOADER_EXTENSION)
     IDR_IMAGE_LOADER_MANIFEST,
 #endif
+    IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST,
+#if defined(ENABLE_SETTINGS_APP)
+    IDR_SETTINGS_APP_MANIFEST,
+#endif
+    IDR_WEBSTORE_MANIFEST,
+
 #if defined(OS_CHROMEOS)
+    // Separate ChromeOS list, as it is quite large.
     IDR_ARC_SUPPORT_MANIFEST,
     IDR_AUDIO_PLAYER_MANIFEST,
     IDR_CHROME_APPS_WEBSTORE_WIDGET_MANIFEST,
@@ -100,14 +111,16 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
     IDR_FILEMANAGER_MANIFEST,
     IDR_FIRST_RUN_DIALOG_MANIFEST,
     IDR_GALLERY_MANIFEST,
-    IDR_GENIUS_APP_MANIFEST,
-    IDR_HELP_MANIFEST,
     IDR_KEYBOARD_MANIFEST,
     IDR_MOBILE_MANIFEST,
-    IDR_QUICKOFFICE_MANIFEST,
     IDR_VIDEO_PLAYER_MANIFEST,
     IDR_WALLPAPERMANAGER_MANIFEST,
-#endif
+#if defined(GOOGLE_CHROME_BUILD)
+    IDR_GENIUS_APP_MANIFEST,
+    IDR_HELP_MANIFEST,
+    IDR_QUICKOFFICE_MANIFEST,
+#endif  // defined(GOOGLE_CHROME_BUILD)
+#endif  // defined(OS_CHROMEOS)
   };
 
   for (size_t i = 0; i < arraysize(allowed); ++i) {

[Evan Stade, 2016/07/15 18:29:31]

nit: why doesn't this function employ a switch/case block?

[Lei Zhang, 2016/07/16 00:35:50]

Probably was a copy + paste from IsComponentExtensionWhitelisted() above, which
cannot use a switch block. Using a switch now.