Remove the test URLRequestJobs from shipping code to just browser_tests. All the tests that used them which were ui_tests have been converted to browser_tests, so we don't need this in automation anymore.

BUG=121574
Review URL: https://chromiumcodereview.appspot.com/10538014

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

7 files changed, 21 insertions, 27 deletions

diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index dffad26..c2710a0 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -748,16 +748,6 @@
     'browser/worker_host/worker_service_impl.h',
     'browser/zygote_host_impl_linux.cc',
     'browser/zygote_host_impl_linux.h',
-    # TODO:  These should be moved to test_support (see below), but
-    # are currently used by production code in automation_provider.cc.
-    'test/net/url_request_failed_job.cc',
-    'test/net/url_request_failed_job.h',
-    'test/net/url_request_mock_http_job.cc',
-    'test/net/url_request_mock_http_job.h',
-    'test/net/url_request_slow_download_job.cc',
-    'test/net/url_request_slow_download_job.h',
-    'test/net/url_request_slow_http_job.cc',
-    'test/net/url_request_slow_http_job.h',
     'zygote/zygote_linux.cc',
     'zygote/zygote_linux.h',
     'zygote/zygote_main_linux.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 930dc3f..3845e9b 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -92,6 +92,14 @@
         'test/mock_render_process_host.cc',
         'test/mock_render_thread.cc',
         'test/mock_resource_context.cc',
+        'test/net/url_request_failed_job.cc',
+        'test/net/url_request_failed_job.h',
+        'test/net/url_request_mock_http_job.cc',
+        'test/net/url_request_mock_http_job.h',
+        'test/net/url_request_slow_download_job.cc',
+        'test/net/url_request_slow_download_job.h',
+        'test/net/url_request_slow_http_job.cc',
+        'test/net/url_request_slow_http_job.h',
         'test/net/url_request_abort_on_end_job.cc',
         'test/net/url_request_abort_on_end_job.h',
         'test/render_view_fake_resources_test.cc',
diff --git a/content/public/test/test_browser_context.h b/content/public/test/test_browser_context.h
index c76eb08..3a73a69 100644
--- a/content/public/test/test_browser_context.h
+++ b/content/public/test/test_browser_context.h
@@ -54,6 +54,6 @@ class TestBrowserContext : public BrowserContext {
   DISALLOW_COPY_AND_ASSIGN(TestBrowserContext);
 };
 
-}
+}  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_TEST_BROWSER_CONTEXT_H_
diff --git a/content/test/net/url_request_failed_job.h b/content/test/net/url_request_failed_job.h
index b09edb7..77ff6f0 100644
--- a/content/test/net/url_request_failed_job.h
+++ b/content/test/net/url_request_failed_job.h
@@ -10,7 +10,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
-#include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_job.h"
 
@@ -23,13 +22,13 @@ class URLRequestFailedJob : public net::URLRequestJob {
   virtual void Start() OVERRIDE;
 
   // Adds the testing URLs to the net::URLRequestFilter.
-  CONTENT_EXPORT static void AddUrlHandler();
+  static void AddUrlHandler();
 
   // Given a net error code, constructs a mock URL that will return that error
   // asynchronously when started.  |net_error| must be a valid net error code
   // other than net::OK and net::ERR_IO_PENDING.
-  CONTENT_EXPORT static GURL GetMockHttpUrl(int net_error);
-  CONTENT_EXPORT static GURL GetMockHttpsUrl(int net_error);
+  static GURL GetMockHttpUrl(int net_error);
+  static GURL GetMockHttpsUrl(int net_error);
 
  private:
   static net::URLRequestJob* Factory(net::URLRequest* request,
diff --git a/content/test/net/url_request_mock_http_job.h b/content/test/net/url_request_mock_http_job.h
index ba2c47a..21a84ee 100644
--- a/content/test/net/url_request_mock_http_job.h
+++ b/content/test/net/url_request_mock_http_job.h
@@ -10,12 +10,11 @@
 
 #include <string>
 
-#include "content/common/content_export.h"
 #include "net/url_request/url_request_file_job.h"
 
 class FilePath;
 
-class CONTENT_EXPORT URLRequestMockHTTPJob : public net::URLRequestFileJob {
+class URLRequestMockHTTPJob : public net::URLRequestFileJob {
  public:
   URLRequestMockHTTPJob(net::URLRequest* request, const FilePath& file_path);
 
diff --git a/content/test/net/url_request_slow_download_job.h b/content/test/net/url_request_slow_download_job.h
index 5ef40c4..698ced8 100644
--- a/content/test/net/url_request_slow_download_job.h
+++ b/content/test/net/url_request_slow_download_job.h
@@ -15,19 +15,18 @@
 
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
-#include "content/common/content_export.h"
 #include "net/url_request/url_request_job.h"
 
 class URLRequestSlowDownloadJob : public net::URLRequestJob {
  public:
   // Test URLs.
-  CONTENT_EXPORT static const char kUnknownSizeUrl[];
-  CONTENT_EXPORT static const char kKnownSizeUrl[];
-  CONTENT_EXPORT static const char kFinishDownloadUrl[];
+  static const char kUnknownSizeUrl[];
+  static const char kKnownSizeUrl[];
+  static const char kFinishDownloadUrl[];
 
   // Download sizes.
-  CONTENT_EXPORT static const int kFirstDownloadSize;
-  CONTENT_EXPORT static const int kSecondDownloadSize;
+  static const int kFirstDownloadSize;
+  static const int kSecondDownloadSize;
 
   // Timer callback, used to check to see if we should finish our download and
   // send the second chunk.
@@ -46,10 +45,10 @@ class URLRequestSlowDownloadJob : public net::URLRequestJob {
 
   // Returns the current number of URLRequestSlowDownloadJobs that have
   // not yet completed.
-  CONTENT_EXPORT static size_t NumberOutstandingRequests();
+  static size_t NumberOutstandingRequests();
 
   // Adds the testing URLs to the net::URLRequestFilter.
-  CONTENT_EXPORT static void AddUrlHandler();
+  static void AddUrlHandler();
 
  private:
   explicit URLRequestSlowDownloadJob(net::URLRequest* request);
diff --git a/content/test/net/url_request_slow_http_job.h b/content/test/net/url_request_slow_http_job.h
index 08e5df3..c6df6da 100644
--- a/content/test/net/url_request_slow_http_job.h
+++ b/content/test/net/url_request_slow_http_job.h
@@ -10,7 +10,6 @@
 
 #include "base/timer.h"
 #include "content/test/net/url_request_mock_http_job.h"
-#include "content/common/content_export.h"
 
 class URLRequestSlowHTTPJob : public URLRequestMockHTTPJob {
  public:
@@ -21,7 +20,7 @@ class URLRequestSlowHTTPJob : public URLRequestMockHTTPJob {
   static net::URLRequest::ProtocolFactory Factory;
 
   // Adds the testing URLs to the net::URLRequestFilter.
-  CONTENT_EXPORT static void AddUrlHandler(const FilePath& base_path);
+  static void AddUrlHandler(const FilePath& base_path);
 
   // Given the path to a file relative to the path passed to AddUrlHandler(),
   // construct a mock URL.