Turn off enabling Google Now via flag in Stable

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 <map>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/metrics/field_trial.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/common/id_util.h"
 #include "extensions/common/manifest_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 476 matching lines @@
     Add(IDR_CHROMEVOX_MANIFEST, path);
   }
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(ENABLE_GOOGLE_NOW)
   const char kEnablePrefix[] = "Enable";
   const char kFieldTrialName[] = "GoogleNow";
   std::string enable_prefix(kEnablePrefix);
   std::string field_trial_result =
       base::FieldTrialList::FindFullName(kFieldTrialName);
-  if (((field_trial_result.compare(
-          0,
-          enable_prefix.length(),
-          enable_prefix) == 0) &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableGoogleNowIntegration)) ||
-       CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableGoogleNowIntegration)) {
+
+  bool enabled_via_field_trial = field_trial_result.compare(
+      0,
+      enable_prefix.length(),
+      enable_prefix) == 0;
+
+  bool enabled_via_flag =
+      chrome::VersionInfo::GetChannel() !=
+          chrome::VersionInfo::CHANNEL_STABLE &&
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableGoogleNowIntegration);
+
+  bool disabled_via_flag =
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableGoogleNowIntegration);
+
+  if ((enabled_via_field_trial && !disabled_via_flag) || enabled_via_flag) {
     Add(IDR_GOOGLE_NOW_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("google_now")));
   }
 #endif
 }
 
 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
   delete component->manifest;
   if (extension_service_->is_ready()) {
     extension_service_->
         RemoveComponentExtension(component->extension_id);
   }
 }
 
 }  // namespace extensions