Index: chrome/browser/ui/webui/options/geolocation_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options/geolocation_options_handler.cc b/chrome/browser/ui/webui/options/geolocation_options_handler.cc |
index 47ec77c4cf4ff6d47969e543943df68ae3a716d2..f101a6b0b6b1ce8cce77f79ff26378c6b2c724df 100644 |
--- a/chrome/browser/ui/webui/options/geolocation_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/geolocation_options_handler.cc |
@@ -22,7 +22,10 @@ void GeolocationOptionsHandler::GetLocalizedValues( |
void GeolocationOptionsHandler::InitializePage() { |
DCHECK(web_ui()); |
- 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)) { |
web_ui()->CallJavascriptFunction( |