Revert of New build flag system, convert Google Now flag

chrome/browser/extensions/component_loader.cc

Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 56a5178e11b563f838ff2aa91bde9382ea5e7c34..1e4a738e534f52d68776db3c5b6217a13fb4986b 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -27,7 +27,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/features.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/crx_file/id_util.h"
@@ -383,7 +382,7 @@
 }
 
 void ComponentLoader::AddGoogleNowExtension() {
-#if BUILDFLAG(ENABLE_GOOGLE_NOW)
+#if defined(ENABLE_GOOGLE_NOW)
   const char kEnablePrefix[] = "Enable";
   const char kFieldTrialName[] = "GoogleNow";
   std::string enable_prefix(kEnablePrefix);
@@ -419,7 +418,7 @@
   } else {
     DeleteData(google_now_manifest_id, root_directory);
   }
-#endif  // BUILDFLAG(ENABLE_GOOGLE_NOW)
+#endif  // defined(ENABLE_GOOGLE_NOW)
 }
 
 #if defined(OS_CHROMEOS)