Enable Google Now By Default

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 1c358f826323798837d078874a113ddd3ab39dde..1f802b5164650d1b718568cb81f846bf45272e57 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -506,11 +506,13 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
   std::string enable_prefix(kEnablePrefix);
   std::string field_trial_result =
       base::FieldTrialList::FindFullName(kFieldTrialName);
-  if ((field_trial_result.compare(
+  if (((field_trial_result.compare(
           0,
           enable_prefix.length(),
-          enable_prefix) == 0) ||
-      CommandLine::ForCurrentProcess()->HasSwitch(
+          enable_prefix) == 0) &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableGoogleNowIntegration)) ||
+       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableGoogleNowIntegration)) {
     Add(IDR_GOOGLE_NOW_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("google_now")));