Enable Google Now on trybots

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 d8f0a840910c72136c9483a6f10c6a1557c3ab81..1c1c428e6ec97889900aa4ffa92504966ee1035c 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -521,6 +521,13 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
       enable_prefix.length(),
       enable_prefix) == 0;
 
+  // Enable the feature on trybots.
+  bool is_on_unknown_channel = chrome::VersionInfo::GetChannel() ==
+      chrome::VersionInfo::CHANNEL_UNKNOWN;
+
+  bool enabled_via_field_trial_or_on_unknown_channel =
+      enabled_via_field_trial || is_on_unknown_channel;
+
   bool enabled_via_flag =
       chrome::VersionInfo::GetChannel() !=
           chrome::VersionInfo::CHANNEL_STABLE &&
@@ -531,7 +538,8 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableGoogleNowIntegration);
 
-  if ((enabled_via_field_trial && !disabled_via_flag) || enabled_via_flag) {
+  if ((enabled_via_field_trial_or_on_unknown_channel && !disabled_via_flag) ||
+      enabled_via_flag) {

[not at google - send to devlin, 2013/11/01 18:15:22]

This is getting increasingly hard to follow. How about this:

bool enabled_via_trunk_build = chrome::VersionInfo::GetChannel() ==    
chrome::VersionInfo::CHANNEL_UNKNOWN;

bool enabled_via_flag = ...;

bool disabled_via_flag = ...;

if ((enabled_via_field_trial && !disabled_via_flag) ||
    (enabled_via_trunk_build && !disabled_via_flag) ||
    enabled_via_flag)) {
  Add(...);
}

[vadimt, 2013/11/01 19:57:21]

Done.

     Add(IDR_GOOGLE_NOW_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("google_now")));
   }