Add Finch Checks to the State Machine

chrome/browser/ui/webui/options/geolocation_options_handler.cc

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