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 07eb949b0e69c38a01ceba74fb48737c338fbde4..66cc7b0cf460ba2ee1db490f951bda953028cd9d 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -468,7 +468,10 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(ENABLE_GOOGLE_NOW)
-  if (base::FieldTrialList::FindFullName("GoogleNow") == "Enable" ||
+  std::string fieldTrialResult =
+      base::FieldTrialList::FindFullName("GoogleNow");
+  if ((fieldTrialResult == "Enable") ||
+      (fieldTrialResult == "EnabledViaFlag") ||

[vadimt, 2013/08/03 02:07:53]

There will be a group 'EnableWithBackground'. I'd check that fieldTrialResult
starts with 'Enable'.

[robliao, 2013/08/09 21:46:44]

Done.

       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableGoogleNowIntegration)) {
     Add(IDR_GOOGLE_NOW_MANIFEST,