Move enable_app_list to a buildflag.

chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/extensions/component_extensions_whitelist/whitelist.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/features.h"
 #include "chrome/grit/browser_resources.h"
 #include "extensions/common/constants.h"
 
-#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
+#if BUILDFLAG(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
 #include "chrome/browser/ui/app_list/google_now_extension.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h"
 #include "components/chrome_apps/grit/chrome_apps_resources.h"
 #include "ui/file_manager/grit/file_manager_resources.h"
 #include "ui/keyboard/grit/keyboard_resources.h"
 #endif
 
@@ skipping 13 matching lines @@
     extension_misc::kSpeechSynthesisExtensionId,
     extension_misc::kZIPUnpackerExtensionId,
 #endif
   };
 
   for (size_t i = 0; i < arraysize(kAllowed); ++i) {
     if (extension_id == kAllowed[i])
       return true;
   }
 
-#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
+#if BUILDFLAG(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
   std::string google_now_extension_id;
   if (GetGoogleNowExtensionId(&google_now_extension_id) &&
       google_now_extension_id == extension_id) {
     return true;
   }
 #endif
 
 #if defined(OS_CHROMEOS)
   if (chromeos::ComponentExtensionIMEManagerImpl::IsIMEExtensionID(
           extension_id)) {
     return true;
   }
 #endif
   LOG(ERROR) << "Component extension with id " << extension_id << " not in "
              << "whitelist and is not being loaded as a result.";
   NOTREACHED();
   return false;
 }
 
 bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
   switch (manifest_resource_id) {
     // Please keep the list in alphabetical order.
     case IDR_BOOKMARKS_MANIFEST:
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
     case IDR_CHROME_APP_MANIFEST:
 #endif
 #if defined(ENABLE_PRINTING)
     case IDR_CLOUDPRINT_MANIFEST:
 #endif
     case IDR_CRYPTOTOKEN_MANIFEST:
     case IDR_FEEDBACK_MANIFEST:
     case IDR_GAIA_AUTH_MANIFEST:
 #if defined(ENABLE_GOOGLE_NOW)
     case IDR_GOOGLE_NOW_MANIFEST:
@@ skipping 41 matching lines @@
   }
 
   LOG(ERROR) << "Component extension with manifest resource id "
              << manifest_resource_id << " not in whitelist and is not being "
              << "loaded as a result.";
   NOTREACHED();
   return false;
 }
 
 }  // namespace extensions