chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc - Issue 394103004: Move DnsApiTest.DnsResolveIPLiteral and DnsApiTest.DnsResolveHostname to app_shell_browsertests.

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/sockets_tcp_server/sockets_tcp_server_apitest.cc

Issue 394103004: Move DnsApiTest.DnsResolveIPLiteral and DnsApiTest.DnsResolveHostname to app_shell_browsertests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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

« apps/shell/browser/dns_apitest.cc ('K') | « chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc ('k') | chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc » ('j') | extensions/browser/api/dns/mock_host_resolver_creator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc

diff --git a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc

index f4a400603f129fd4bc404a1935876dc7ffb8a0a2..8b9a7ab40b72647f76bf1b12acd8f2b16b09ba6c 100644

--- a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc

+++ b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc

@@ -5,7 +5,6 @@

#include "base/memory/ref_counted.h"

#include "base/path_service.h"

#include "base/strings/stringprintf.h"

-#include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h"

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

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

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

@@ -16,6 +15,7 @@

#include "chrome/test/base/in_process_browser_test.h"

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

#include "extensions/browser/api/dns/host_resolver_wrapper.h"

+#include "extensions/browser/api/dns/mock_host_resolver_creator.h"

#include "extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.h"

#include "net/dns/mock_host_resolver.h"

#include "net/test/spawned_test_server/spawned_test_server.h"