Add Finch Checks to the State Machine

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 36d6be519f7e746d10a5a133e7d1ed01bb85df33..d3d314110bd60fbc244fcff7e3efc65814ac3843 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -470,7 +470,13 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(ENABLE_GOOGLE_NOW)
-  if (base::FieldTrialList::FindFullName("GoogleNow") == "Enable" ||
+  std::string enable_prefix("Enable");
+  std::string field_trial_result =
+      base::FieldTrialList::FindFullName("GoogleNow");

[miket_OOO, 2013/08/13 16:59:37]

Can these be const? It might enable some simpler code generation. Not a big deal
either way.

+  if ((field_trial_result.compare(
+          0,
+          enable_prefix.length(),
+          enable_prefix) == 0) ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableGoogleNowIntegration)) {
     Add(IDR_GOOGLE_NOW_MANIFEST,