Enable Google Now on trybots

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"
@@ skipping 503 matching lines @@
   const char kFieldTrialName[] = "GoogleNow";
   std::string enable_prefix(kEnablePrefix);
   std::string field_trial_result =
       base::FieldTrialList::FindFullName(kFieldTrialName);
 
   bool enabled_via_field_trial = field_trial_result.compare(
       0,
       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 &&
       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) {
+  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")));
   }
 #endif
 }
 
 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
   delete component->manifest;
   if (extension_service_->is_ready()) {
     extension_service_->
         RemoveComponentExtension(component->extension_id);
   }
 }
 
 }  // namespace extensions