Fix Android strict-mode violation in GeoLocation info bar.

chrome/browser/android/google_location_settings_helper.h

Index: chrome/browser/android/google_location_settings_helper.h
diff --git a/chrome/browser/android/google_location_settings_helper.h b/chrome/browser/android/google_location_settings_helper.h
index 6bf5853183d98eaea7ccd212fbf85294aafd5e1d..6d6a513fa72be06fe6d6031fefaad2462c7b0bbd 100644
--- a/chrome/browser/android/google_location_settings_helper.h
+++ b/chrome/browser/android/google_location_settings_helper.h
@@ -17,8 +17,11 @@ class GoogleLocationSettingsHelper {
 
   static GoogleLocationSettingsHelper* Create();
 
-  virtual std::string GetAcceptButtonLabel() = 0;
+  virtual std::string GetAcceptButtonLabel(bool allow) = 0;

[bulach, 2013/09/12 09:18:29]

this would break downstream, need to do a two-sided patch (i.e, add a new method
with the param, non-virtual, a TODO to remove this method, then after it rolls
downstream, remove the the version without param...).

[acleung1, 2013/09/17 00:08:45]

Ya. I have a downstream patch that I'll be tagging the merger to merge. That
change is rather small so I wanted to get this one in a good state before
sending the other out for review.

   virtual void ShowGoogleLocationSettings() = 0;
+  // Checks both Master and Google Apps location setting to see
+  // if we should use "Allow" in the accept button.
+  virtual bool IsAllowLabel() = 0;
   virtual bool IsMasterLocationSettingEnabled() = 0;
   virtual bool IsGoogleAppsLocationSettingEnabled() = 0;