chrome/browser/geolocation/geolocation_permission_context_unittest.cc - Issue 441883003: Simplify Android geolocation permission checks

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/geolocation/geolocation_permission_context_unittest.cc

Issue 441883003: Simplify Android geolocation permission checks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 years, 4 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/geolocation/geolocation_permission_context_android.cc ('k') | chrome/browser/media/protected_media_identifier_permission_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_permission_context_unittest.cc

diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc

index a0ebc1189f941c237cde7d824bc5a5a5f534e69a..9ae3a305414dee56dd96abfacef9508e28c93f37 100644

--- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc

+++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc

@@ -304,18 +304,6 @@ TEST_F(GeolocationPermissionContextTests, GeolocationEnabledDisabled) {

MockGoogleLocationSettingsHelper::SetLocationStatus(true, false);

EXPECT_EQ(0U, infobar_service()->infobar_count());

RequestGeolocationPermission(web_contents(), RequestID(0), requesting_frame);

- EXPECT_EQ(1U, infobar_service()->infobar_count());

- ConfirmInfoBarDelegate* infobar_delegate_1 =

- infobar_service()->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate();

- ASSERT_TRUE(infobar_delegate_1);

- base::string16 text_1 = infobar_delegate_1->GetButtonLabel(

- ConfirmInfoBarDelegate::BUTTON_OK);

- EXPECT_NE(text_0, text_1);

- Reload();

- MockGoogleLocationSettingsHelper::SetLocationStatus(false, false);

- EXPECT_EQ(0U, infobar_service()->infobar_count());

- RequestGeolocationPermission(web_contents(), RequestID(0), requesting_frame);

EXPECT_EQ(0U, infobar_service()->infobar_count());

}

@@ -340,13 +328,7 @@ TEST_F(GeolocationPermissionContextTests, MasterEnabledGoogleAppsDisabled) {

MockGoogleLocationSettingsHelper::SetLocationStatus(true, false);

EXPECT_EQ(0U, infobar_service()->infobar_count());

RequestGeolocationPermission(web_contents(), RequestID(0), requesting_frame);

- EXPECT_EQ(1U, infobar_service()->infobar_count());

- ConfirmInfoBarDelegate* infobar_delegate =

- infobar_service()->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate();

- ASSERT_TRUE(infobar_delegate);

- infobar_delegate->Accept();

- EXPECT_TRUE(

- MockGoogleLocationSettingsHelper::WasGoogleLocationSettingsCalled());

+ EXPECT_EQ(0U, infobar_service()->infobar_count());

}

#endif