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 39783ef4dd899aae1ac470d38d0f015f2a9d8215..ca4d2cfb3063c427598b250ca67275bd0dc40ec5 100644
--- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
+++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
@@ -10,8 +10,8 @@
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "chrome/grit/browser_resources.h"
 #include "extensions/common/constants.h"
-#include "grit/browser_resources.h"
 
 #if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
 #include "chrome/browser/ui/app_list/google_now_extension.h"
@@ -27,7 +27,7 @@
 namespace extensions {
 
 bool IsComponentExtensionWhitelisted(const std::string& extension_id) {
-  const char* allowed[] = {
+  const char* const kAllowed[] = {
     extension_misc::kHotwordSharedModuleId,
     extension_misc::kInAppPaymentsSupportAppId,
 #if defined(ENABLE_MEDIA_ROUTER)
@@ -41,16 +41,17 @@ bool IsComponentExtensionWhitelisted(const std::string& extension_id) {
 #endif
   };
 
-  for (size_t i = 0; i < arraysize(allowed); ++i) {
-    if (extension_id == allowed[i])
+  for (size_t i = 0; i < arraysize(kAllowed); ++i) {
+    if (extension_id == kAllowed[i])
       return true;
   }
 
 #if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
   std::string google_now_extension_id;
   if (GetGoogleNowExtensionId(&google_now_extension_id) &&
-      google_now_extension_id == extension_id)
+      google_now_extension_id == extension_id) {
     return true;
+  }
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -66,51 +67,58 @@ bool IsComponentExtensionWhitelisted(const std::string& extension_id) {
 }
 
 bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
-  int allowed[] = {
-    IDR_BOOKMARKS_MANIFEST,
-    IDR_CHROME_APP_MANIFEST,
-    IDR_CLOUDPRINT_MANIFEST,
-    IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST,
-    IDR_CRYPTOTOKEN_MANIFEST,
-    IDR_FEEDBACK_MANIFEST,
-    IDR_GAIA_AUTH_MANIFEST,
-    IDR_GOOGLE_NOW_MANIFEST,
-    IDR_HANGOUT_SERVICES_MANIFEST,
-    IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST,
-    IDR_HOTWORD_MANIFEST,
-    IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST,
-    IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST,
-    IDR_WALLPAPERMANAGER_MANIFEST,
-    IDR_WEBSTORE_MANIFEST,
-#if defined(IMAGE_LOADER_EXTENSION)
-    IDR_IMAGE_LOADER_MANIFEST,
+  switch (manifest_resource_id) {
+    // Please keep the list in alphabetical order.
+    case IDR_BOOKMARKS_MANIFEST:
+#if defined(ENABLE_APP_LIST)
+    case IDR_CHROME_APP_MANIFEST:
 #endif
-#if defined(OS_CHROMEOS)
-    IDR_ARC_SUPPORT_MANIFEST,
-    IDR_AUDIO_PLAYER_MANIFEST,
-    IDR_CHROME_APPS_WEBSTORE_WIDGET_MANIFEST,
-    IDR_CONNECTIVITY_DIAGNOSTICS_LAUNCHER_MANIFEST,
-    IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST,
-    IDR_CROSH_BUILTIN_MANIFEST,
-    IDR_DEMO_APP_MANIFEST,
-    IDR_EASY_UNLOCK_MANIFEST,
-    IDR_EASY_UNLOCK_MANIFEST_SIGNIN,
-    IDR_ECHO_MANIFEST,
-    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,
+    case IDR_CLOUDPRINT_MANIFEST:
+    case IDR_CRYPTOTOKEN_MANIFEST:
+    case IDR_FEEDBACK_MANIFEST:
+    case IDR_GAIA_AUTH_MANIFEST:
+#if defined(ENABLE_GOOGLE_NOW)
+    case IDR_GOOGLE_NOW_MANIFEST:
 #endif
-  };
+#if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
+    case IDR_HANGOUT_SERVICES_MANIFEST:
+#endif
+#if defined(ENABLE_HOTWORDING)
+    case IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST:
+    case IDR_HOTWORD_MANIFEST:
+#endif
+    case IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST:
+#if defined(IMAGE_LOADER_EXTENSION)
+    case IDR_IMAGE_LOADER_MANIFEST:
+#endif
+    case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST:
+    case IDR_WEBSTORE_MANIFEST:
 
-  for (size_t i = 0; i < arraysize(allowed); ++i) {
-    if (manifest_resource_id == allowed[i])
+#if defined(OS_CHROMEOS)
+    // Separate ChromeOS list, as it is quite large.
+    case IDR_ARC_SUPPORT_MANIFEST:
+    case IDR_AUDIO_PLAYER_MANIFEST:
+    case IDR_CHROME_APPS_WEBSTORE_WIDGET_MANIFEST:
+    case IDR_CONNECTIVITY_DIAGNOSTICS_LAUNCHER_MANIFEST:
+    case IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST:
+    case IDR_CROSH_BUILTIN_MANIFEST:
+    case IDR_DEMO_APP_MANIFEST:
+    case IDR_EASY_UNLOCK_MANIFEST:
+    case IDR_EASY_UNLOCK_MANIFEST_SIGNIN:
+    case IDR_ECHO_MANIFEST:
+    case IDR_FILEMANAGER_MANIFEST:
+    case IDR_FIRST_RUN_DIALOG_MANIFEST:
+    case IDR_GALLERY_MANIFEST:
+    case IDR_KEYBOARD_MANIFEST:
+    case IDR_MOBILE_MANIFEST:
+    case IDR_VIDEO_PLAYER_MANIFEST:
+    case IDR_WALLPAPERMANAGER_MANIFEST:
+#if defined(GOOGLE_CHROME_BUILD)
+    case IDR_GENIUS_APP_MANIFEST:
+    case IDR_HELP_MANIFEST:
+    case IDR_QUICKOFFICE_MANIFEST:
+#endif  // defined(GOOGLE_CHROME_BUILD)
+#endif  // defined(OS_CHROMEOS)
       return true;
   }