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..5bc9af30e69ae1548249c43b3b7ad10675c82aab 100644 |
--- a/chrome/browser/extensions/component_loader.cc |
+++ b/chrome/browser/extensions/component_loader.cc |
@@ -470,7 +470,10 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( |
#endif // defined(OS_CHROMEOS) |
#if defined(ENABLE_GOOGLE_NOW) |
- if (base::FieldTrialList::FindFullName("GoogleNow") == "Enable" || |
+ std::string enablePrefix("Enable"); |
+ std::string fieldTrialResult = |
+ base::FieldTrialList::FindFullName("GoogleNow"); |
+ if ((fieldTrialResult.compare(0, enablePrefix.length(), enablePrefix) == 0) || |
CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnableGoogleNowIntegration)) { |
Add(IDR_GOOGLE_NOW_MANIFEST, |