Move MockHostResolver to net_test_support

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/7531002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94539 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 8 deletions

diff --git a/net/base/mock_host_resolver.h b/net/base/mock_host_resolver.h
index b9e2f28..acf06cb 100644
--- a/net/base/mock_host_resolver.h
+++ b/net/base/mock_host_resolver.h
@@ -11,7 +11,6 @@
 #include "base/synchronization/waitable_event.h"
 #include "net/base/host_resolver_impl.h"
 #include "net/base/host_resolver_proc.h"
-#include "net/base/net_api.h"
 
 namespace net {
 
@@ -38,7 +37,7 @@ class RuleBasedHostResolverProc;
 // re-map one hostname to another as well.
 
 // Base class shared by MockHostResolver and MockCachingHostResolver.
-class NET_TEST MockHostResolverBase : public HostResolver {
+class MockHostResolverBase : public HostResolver {
  public:
   virtual ~MockHostResolverBase();
 
@@ -102,7 +101,7 @@ class MockCachingHostResolver : public MockHostResolverBase {
 // a replacement host string. It then uses the system host resolver to return
 // a socket address. Generally the replacement should be an IPv4 literal so
 // there is no network dependency.
-class NET_TEST RuleBasedHostResolverProc : public HostResolverProc {
+class RuleBasedHostResolverProc : public HostResolverProc {
  public:
   explicit RuleBasedHostResolverProc(HostResolverProc* previous);
 
@@ -153,7 +152,7 @@ class NET_TEST RuleBasedHostResolverProc : public HostResolverProc {
 };
 
 // Using WaitingHostResolverProc you can simulate very long lookups.
-class NET_TEST WaitingHostResolverProc : public HostResolverProc {
+class WaitingHostResolverProc : public HostResolverProc {
  public:
   explicit WaitingHostResolverProc(HostResolverProc* previous);
 
@@ -181,7 +180,7 @@ class NET_TEST WaitingHostResolverProc : public HostResolverProc {
 //
 // NOTE: Only use this as a catch-all safety net. Individual tests should use
 // MockHostResolver.
-class NET_TEST ScopedDefaultHostResolverProc {
+class ScopedDefaultHostResolverProc {
  public:
   ScopedDefaultHostResolverProc();
   explicit ScopedDefaultHostResolverProc(HostResolverProc* proc);
diff --git a/net/net.gyp b/net/net.gyp
index 3e96a26..4ae27c0 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -126,9 +126,6 @@
         'base/mime_sniffer.h',
         'base/mime_util.cc',
         'base/mime_util.h',
-        # TODO(eroman): move this into its own test-support target.
-        'base/mock_host_resolver.cc',
-        'base/mock_host_resolver.h',
         'base/net_api.h',
         'base/net_error_list.h',
         'base/net_errors.cc',
@@ -1191,6 +1188,8 @@
         'base/cookie_monster_store_test.h',
         'base/cookie_store_test_helpers.cc',
         'base/cookie_store_test_helpers.h',
+        'base/mock_host_resolver.cc',
+        'base/mock_host_resolver.h',
         'base/net_test_suite.cc',
         'base/net_test_suite.h',
         'base/test_completion_callback.cc',