chrome/browser/extensions/extension_javascript_url_apitest.cc - Issue 12518036: net: move host_resolver files from net/base to net/dns

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/extension_javascript_url_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:

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 "chrome/browser/extensions/extension_apitest.h"	5 #include "chrome/browser/extensions/extension_apitest.h"

6 #include "net/base/mock_host_resolver.h"	6 #include "net/dns/mock_host_resolver.h"

7	7

8 // If crashing, mark disabled and update http://crbug.com/63589.	8 // If crashing, mark disabled and update http://crbug.com/63589.

9 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, JavaScriptURLPermissions) {	9 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, JavaScriptURLPermissions) {

10 host_resolver()->AddRule("a.com", "127.0.0.1");	10 host_resolver()->AddRule("a.com", "127.0.0.1");

11 host_resolver()->AddRule("b.com", "127.0.0.1");	11 host_resolver()->AddRule("b.com", "127.0.0.1");

12 ASSERT_TRUE(StartTestServer());	12 ASSERT_TRUE(StartTestServer());

13	13

14 ASSERT_TRUE(RunExtensionTest("tabs/javascript_url_permissions")) << message_;	14 ASSERT_TRUE(RunExtensionTest("tabs/javascript_url_permissions")) << message_;

15 }	15 }

OLD	NEW