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..2e64185c55f968a7cf44b131ff9751119c601eef 100644 |
--- a/chrome/browser/ui/webui/options/geolocation_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/geolocation_options_handler.cc |
@@ -22,7 +22,13 @@ void GeolocationOptionsHandler::GetLocalizedValues( |
void GeolocationOptionsHandler::InitializePage() { |
DCHECK(web_ui()); |
- if ((base::FieldTrialList::FindFullName("GoogleNow") == "Enable") || |
+ std::string enable_prefix("Enable"); |
+ std::string field_trial_result = |
+ base::FieldTrialList::FindFullName("GoogleNow"); |
+ if ((field_trial_result.compare( |
+ 0, |
+ enable_prefix.length(), |
+ enable_prefix) == 0) || |
CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnableGoogleNowIntegration)) { |
web_ui()->CallJavascriptFunction( |