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

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/extensions/extension_websocket_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:

Index: chrome/browser/extensions/extension_websocket_apitest.cc

diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc

index 16307fb941ceb23da0d4babd00de67efa333c8e8..f71ddb91e5ec5a12850409d82d6a7cd4718a47e6 100644

--- a/chrome/browser/extensions/extension_websocket_apitest.cc

+++ b/chrome/browser/extensions/extension_websocket_apitest.cc

@@ -5,8 +5,8 @@

#include "base/path_service.h"

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

#include "content/public/common/content_paths.h"

-#include "net/base/mock_host_resolver.h"

#include "net/base/test_data_directory.h"

+#include "net/dns/mock_host_resolver.h"

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) {

ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory()));