Add Finch Checks to the State Machine

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 450 matching lines @@
   // Load ChromeVox extension now if spoken feedback is enabled.
   if (chromeos::AccessibilityManager::Get() &&
       chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()) {
     base::FilePath path =
         base::FilePath(extension_misc::kChromeVoxExtensionPath);
     Add(IDR_CHROMEVOX_MANIFEST, path);
   }
 #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,
         base::FilePath(FILE_PATH_LITERAL("google_now")));
   }
 #endif
 }
 
 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
   delete component->manifest;
   if (extension_service_->is_ready()) {
     extension_service_->
         UnloadExtension(component->extension_id,
                         extension_misc::UNLOAD_REASON_DISABLE);
   }
 }
 
 }  // namespace extensions