Add Finch Checks to the State Machine

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

 // Copyright 2013 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/ui/webui/options/geolocation_options_handler.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/web_ui.h"
 
 namespace options {
 
 GeolocationOptionsHandler::GeolocationOptionsHandler() {}
 
 GeolocationOptionsHandler::~GeolocationOptionsHandler() {}
 
 void GeolocationOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
 }
 
 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(
         "GeolocationOptions.showGeolocationOption");
   }
 }
 
 }  // namespace options