Revert of New build flag system, convert Google Now flag

chrome/browser/ui/webui/options/options_ui.cc

Index: chrome/browser/ui/webui/options/options_ui.cc
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index 56e784c2d368db0ed6acb0094e3667aca20d281f..e69c1990c2f61d4bdfd25a10422acb309ca23b55 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -47,7 +47,6 @@
 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
 #include "chrome/browser/ui/webui/options/sync_setup_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
-#include "chrome/common/features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
@@ -101,7 +100,7 @@
 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
 #endif
 
-#if BUILDFLAG(ENABLE_GOOGLE_NOW)
+#if defined(ENABLE_GOOGLE_NOW)
 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h"
 #endif
 
@@ -280,7 +279,7 @@
   AddOptionsPageUIHandler(localized_strings, new CreateProfileHandler());
   AddOptionsPageUIHandler(localized_strings, new EasyUnlockHandler());
   AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
-#if BUILDFLAG(ENABLE_GOOGLE_NOW)
+#if defined(ENABLE_GOOGLE_NOW)
   AddOptionsPageUIHandler(localized_strings, new GeolocationOptionsHandler());
 #endif
   AddOptionsPageUIHandler(localized_strings, new options::HelpOverlayHandler());