Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

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

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
OLDNEW
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/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"
16 #include "content/public/test/browser_test_utils.h" 16 #include "content/public/test/browser_test_utils.h"
17 #include "googleurl/src/gurl.h" 17 #include "googleurl/src/gurl.h"
18 #include "net/base/mock_host_resolver.h" 18 #include "net/dns/mock_host_resolver.h"
19 19
20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptAllFrames) { 20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptAllFrames) {
21 ASSERT_TRUE(StartTestServer()); 21 ASSERT_TRUE(StartTestServer());
22 ASSERT_TRUE(RunExtensionTest("content_scripts/all_frames")) << message_; 22 ASSERT_TRUE(RunExtensionTest("content_scripts/all_frames")) << message_;
23 } 23 }
24 24
25 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptAboutBlankIframes) { 25 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptAboutBlankIframes) {
26 ASSERT_TRUE(StartTestServer()); 26 ASSERT_TRUE(StartTestServer());
27 ASSERT_TRUE( 27 ASSERT_TRUE(
28 RunExtensionTest("content_scripts/about_blank_iframes")) << message_; 28 RunExtensionTest("content_scripts/about_blank_iframes")) << message_;
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 PermissionsRequestFunction::SetAutoConfirmForTests(true); 167 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 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698