Fix Android strict-mode violation in GeoLocation info bar.

chrome/browser/android/google_location_settings_helper.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_ANDROID_GOOGLE_LOCATION_SETTINGS_HELPER_H_
 #define CHROME_BROWSER_ANDROID_GOOGLE_LOCATION_SETTINGS_HELPER_H_
 
 #include "base/values.h"
 
 // This class is needed to fetch the current system location
 // setting and update the infobar button label based on that information i.e,
 // display "Allow" if google apps setting is set as enabled else, display
 // "Settings" with a link to open the system location settings activity.
 class GoogleLocationSettingsHelper {
  public:
   virtual ~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;
 
  protected:
   GoogleLocationSettingsHelper() {}
 
  private:
 
   DISALLOW_COPY_AND_ASSIGN(GoogleLocationSettingsHelper);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_GOOGLE_LOCATION_SETTINGS_HELPER_H_