Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / android / mock_google_location_settings_helper.h

diff --git a/src/chrome/browser/android/mock_google_location_settings_helper.h b/src/chrome/browser/android/mock_google_location_settings_helper.h
index 328f2a9..71eb1e8 100644 (file)
--- a/src/chrome/browser/android/mock_google_location_settings_helper.h
+++ b/src/chrome/browser/android/mock_google_location_settings_helper.h
@@ -11,13 +11,11 @@
 class MockGoogleLocationSettingsHelper : public GoogleLocationSettingsHelper {
  public:
   static void SetLocationStatus(bool master, bool google_apps);
-  static bool WasGoogleLocationSettingsCalled();
 
-  // GoogleLocationSettingsHelper implementation:
-  virtual std::string GetAcceptButtonLabel() OVERRIDE;
-  virtual void ShowGoogleLocationSettings() OVERRIDE;
-  virtual bool IsMasterLocationSettingEnabled() OVERRIDE;
-  virtual bool IsGoogleAppsLocationSettingEnabled() OVERRIDE;
+  virtual bool IsSystemLocationEnabled() override;
+
+  bool IsMasterLocationSettingEnabled();
+  bool IsGoogleAppsLocationSettingEnabled();
 
  protected:
   MockGoogleLocationSettingsHelper();
@@ -28,7 +26,6 @@ class MockGoogleLocationSettingsHelper : public GoogleLocationSettingsHelper {
 
   static bool master_location_enabled;
   static bool google_apps_location_enabled;
-  static bool was_google_location_settings_called;
 
   DISALLOW_COPY_AND_ASSIGN(MockGoogleLocationSettingsHelper);
 };