chrome/browser/extensions/content_script_apitest.cc - Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.

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/content_script_apitest.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/bundle_installer.cc ('k') | chrome/browser/extensions/context_menu_matcher.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 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 "base/utf_string_conversions.h"	5 #include "base/strings/utf_string_conversions.h"

6 #include "chrome/browser/extensions/api/permissions/permissions_api.h"	6 #include "chrome/browser/extensions/api/permissions/permissions_api.h"

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

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

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

10 #include "chrome/browser/ui/tabs/tab_strip_model.h"	10 #include "chrome/browser/ui/tabs/tab_strip_model.h"

11 #include "chrome/common/chrome_notification_types.h"	11 #include "chrome/common/chrome_notification_types.h"

12 #include "chrome/common/chrome_switches.h"	12 #include "chrome/common/chrome_switches.h"

13 #include "chrome/common/extensions/extension.h"	13 #include "chrome/common/extensions/extension.h"

14 #include "chrome/test/base/ui_test_utils.h"	14 #include "chrome/test/base/ui_test_utils.h"

15 #include "content/public/browser/web_contents.h"	15 #include "content/public/browser/web_contents.h"

(...skipping 151 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
167 extensions::PermissionsRequestFunction::SetAutoConfirmForTests(true);	167 extensions::PermissionsRequestFunction::SetAutoConfirmForTests(true);

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

169 ASSERT_TRUE(StartTestServer());	169 ASSERT_TRUE(StartTestServer());

170 ASSERT_TRUE(RunExtensionTest("content_scripts/permissions")) << message_;	170 ASSERT_TRUE(RunExtensionTest("content_scripts/permissions")) << message_;

171 }	171 }

172	172

173 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptBypassPageCSP) {	173 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptBypassPageCSP) {

174 ASSERT_TRUE(StartTestServer());	174 ASSERT_TRUE(StartTestServer());

175 ASSERT_TRUE(RunExtensionTest("content_scripts/bypass_page_csp")) << message_;	175 ASSERT_TRUE(RunExtensionTest("content_scripts/bypass_page_csp")) << message_;

176 }	176 }

OLD	NEW