chrome/browser/extensions/api/web_navigation/web_navigation_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/api/web_navigation/web_navigation_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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/socket/socket_apitest.cc ('k') | chrome/browser/extensions/api/web_request/web_request_api_unittest.cc » ('j') | webkit/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

index 42a1e922aba0e8f91363e77c569a25a0e72990b4..d599ede76597a8e5f1c3640427578fe69a1c17d8 100644

--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

@@ -7,8 +7,8 @@

#include "base/memory/ref_counted.h"

#include "base/memory/weak_ptr.h"

-#include "base/utf_string_conversions.h"

#include "base/stringprintf.h"

+#include "base/utf_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_browser_main.h"

@@ -36,7 +36,7 @@

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

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

#include "content/public/test/browser_test_utils.h"

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

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

#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"

#include "webkit/glue/resource_type.h"