chrome/browser/android/mock_google_location_settings_helper.h - Issue 852593002: Allow overriding GoogleLocationSettingsHelper for tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/mock_google_location_settings_helper.h

Issue 852593002: Allow overriding GoogleLocationSettingsHelper for tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/android/google_location_settings_helper.h ('k') | chrome/browser/geolocation/geolocation_permission_context_android.h » ('j') | chrome/browser/geolocation/geolocation_permission_context_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/mock_google_location_settings_helper.h

diff --git a/chrome/browser/android/mock_google_location_settings_helper.h b/chrome/browser/android/mock_google_location_settings_helper.h

index 71eb1e8302a7bd05e60810fc263075b195df46ba..4647c616722203329229875ba35be15c88683749 100644

--- a/chrome/browser/android/mock_google_location_settings_helper.h

+++ b/chrome/browser/android/mock_google_location_settings_helper.h

@@ -10,6 +10,9 @@

// Mock implementation of GoogleLocationSettingsHelper for unit tests.

class MockGoogleLocationSettingsHelper : public GoogleLocationSettingsHelper {

public:

+ MockGoogleLocationSettingsHelper();

+ virtual ~MockGoogleLocationSettingsHelper();

Michael van Ouwerkerk 2015/01/13 16:33:47 Nit: use override rather than virtual.

newt (away) 2015/01/13 16:55:03 Done.

static void SetLocationStatus(bool master, bool google_apps);

virtual bool IsSystemLocationEnabled() override;

@@ -17,10 +20,6 @@ class MockGoogleLocationSettingsHelper : public GoogleLocationSettingsHelper {

bool IsMasterLocationSettingEnabled();

bool IsGoogleAppsLocationSettingEnabled();

- protected:

- MockGoogleLocationSettingsHelper();

- virtual ~MockGoogleLocationSettingsHelper();

private:

friend class GoogleLocationSettingsHelper;