chrome/browser/extensions/permissions_apitest.cc - Issue 8493017: Cleanup extension permissions module.

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/extensions/permissions_apitest.cc

Issue 8493017: Cleanup extension permissions module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 8 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/extensions/lazy_background_page_apitest.cc ('k') | chrome/browser/extensions/permissions_updater.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/extensions/extension_apitest.h"	5 #include "chrome/browser/extensions/extension_apitest.h"

	6 #include "chrome/browser/extensions/extension_permissions_api.h"

6 #include "chrome/browser/extensions/extension_prefs.h"	7 #include "chrome/browser/extensions/extension_prefs.h"

7 #include "chrome/browser/extensions/extension_service.h"	8 #include "chrome/browser/extensions/extension_service.h"

8 #include "chrome/browser/profiles/profile.h"	9 #include "chrome/browser/profiles/profile.h"

9 #include "chrome/browser/ui/browser.h"	10 #include "chrome/browser/ui/browser.h"

10 #include "chrome/common/chrome_switches.h"	11 #include "chrome/common/chrome_switches.h"

11 #include "chrome/common/extensions/extension_permission_set.h"	12 #include "chrome/common/extensions/extension_permission_set.h"

12 #include "net/base/mock_host_resolver.h"	13 #include "net/base/mock_host_resolver.h"

13	14

14 namespace {	15 namespace {

15	16

(...skipping 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
107 }	108 }

108	109

109 // Tests that the permissions.request function must be called from within a	110 // Tests that the permissions.request function must be called from within a

110 // user gesture.	111 // user gesture.

111 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsGesture) {	112 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsGesture) {

112 RequestPermissionsFunction::SetIgnoreUserGestureForTests(false);	113 RequestPermissionsFunction::SetIgnoreUserGestureForTests(false);

113 host_resolver()->AddRule("*.com", "127.0.0.1");	114 host_resolver()->AddRule("*.com", "127.0.0.1");

114 ASSERT_TRUE(StartTestServer());	115 ASSERT_TRUE(StartTestServer());

115 EXPECT_TRUE(RunExtensionTest("permissions/optional_gesture")) << message_;	116 EXPECT_TRUE(RunExtensionTest("permissions/optional_gesture")) << message_;

116 }	117 }

OLD	NEW