Move some global feature defines to buildflags

chrome/browser/extensions/component_loader.cc

 // Copyright (c) 2012 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_loader.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 318 matching lines @@
 #if defined(OS_CHROMEOS)
   AddWithNameAndDescription(
       IDR_CHROME_APPS_WEBSTORE_WIDGET_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("webstore_widget")),
       l10n_util::GetStringUTF8(IDS_WEBSTORE_WIDGET_APP_NAME),
       l10n_util::GetStringUTF8(IDS_WEBSTORE_WIDGET_APP_DESC));
 #endif
 }
 
 void ComponentLoader::AddHangoutServicesExtension() {
-#if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
+#if defined(GOOGLE_CHROME_BUILD) || BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
   Add(IDR_HANGOUT_SERVICES_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("hangout_services")));
 #endif
 }
 
 void ComponentLoader::AddHotwordAudioVerificationApp() {
 #if defined(ENABLE_HOTWORDING)
   if (HotwordServiceFactory::IsAlwaysOnAvailable()) {
     Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification")));
@@ skipping 340 matching lines @@
       manifest.release(),
       root_directory,
       false);
   CHECK_EQ(extension_id, actual_extension_id);
   if (!done_cb.is_null())
     done_cb.Run();
 }
 #endif
 
 }  // namespace extensions