Simplify Android geolocation permission checks

chrome/browser/android/mock_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_MOCK_GOOGLE_LOCATION_SETTINGS_HELPER_H_
 #define CHROME_BROWSER_ANDROID_MOCK_GOOGLE_LOCATION_SETTINGS_HELPER_H_
 
 #include "chrome/browser/android/google_location_settings_helper.h"
 
 // Mock implementation of GoogleLocationSettingsHelper for unit tests.
 class MockGoogleLocationSettingsHelper : public GoogleLocationSettingsHelper {
  public:
   static void SetLocationStatus(bool master, bool google_apps);
-  static bool WasGoogleLocationSettingsCalled();
 
   // GoogleLocationSettingsHelper implementation:

[Michael van Ouwerkerk, 2014/08/06 10:47:43]

Don't you need virtual bool IsSystemLocationEnabled() OVERRIDE; because
google_location_settings_helper.cc is temporary? Otherwise you'll need to touch
this file again when you remove the temp.

[Miguel Garcia, 2014/08/06 12:56:58]

Which is fine, once I remove the temp I implement it at once. See
https://chromiumcodereview.appspot.com/440123002/

-  virtual std::string GetAcceptButtonLabel(bool allow) OVERRIDE;
-  virtual void ShowGoogleLocationSettings() OVERRIDE;
   virtual bool IsMasterLocationSettingEnabled() OVERRIDE;

[Michael van Ouwerkerk, 2014/08/06 10:47:43]

So this can be deleted as well?

[Miguel Garcia, 2014/08/06 12:56:58]

There are tests that set/check for this condition. I prefer to leave them for
testing purposes.

   virtual bool IsGoogleAppsLocationSettingEnabled() OVERRIDE;

[Michael van Ouwerkerk, 2014/08/06 10:47:43]

And this?

[Miguel Garcia, 2014/08/06 12:56:58]

ditto

-  virtual bool IsAllowLabel() OVERRIDE;
 
  protected:
   MockGoogleLocationSettingsHelper();
   virtual ~MockGoogleLocationSettingsHelper();
 
  private:
   friend class GoogleLocationSettingsHelper;
 
   static bool master_location_enabled;
   static bool google_apps_location_enabled;

[Michael van Ouwerkerk, 2014/08/06 10:47:43]

And these two could be replaced by:
static bool is_system_location_enabled;

[Miguel Garcia, 2014/08/06 12:56:58]

ditto. In the tests you want to ensure that changing any of the two conditions
prevent geolocation from showing up. It will make a bit more sense once we
upstream the actual checks that happen in the real code.

-  static bool was_google_location_settings_called;
 
   DISALLOW_COPY_AND_ASSIGN(MockGoogleLocationSettingsHelper);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_MOCK_GOOGLE_LOCATION_SETTINGS_HELPER_H_