Change most content::URLFetcher references to net::URLFetcher

The only remaining use of content::URLFetcher is content::URLFetcher::Create.

Make content::URLFetcher not inherit from net::URLFetcher.

Also make code that directly create URLFetcherImpl instead call content::URLFetcher::Create.

BUG=118220
TEST=
TBR=mnissler@chromium.org,sky@chromium.org,mal@chromium.org,sail@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10412050

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

2 files changed, 9 insertions, 8 deletions

diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.cc b/chrome/service/cloud_print/cloud_print_url_fetcher.cc
index 3a8990a..4b9dff6 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher.cc
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher.cc
@@ -12,6 +12,7 @@
 #include "chrome/service/cloud_print/cloud_print_token_store.h"
 #include "chrome/service/net/service_url_request_context.h"
 #include "chrome/service/service_process.h"
+#include "content/public/common/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request_status.h"
@@ -31,7 +32,7 @@ void CloudPrintURLFetcher::StartGetRequest(
     int max_retries,
     const std::string& additional_headers) {
   StartRequestHelper(url,
-                     content::URLFetcher::GET,
+                     net::URLFetcher::GET,
                      delegate,
                      max_retries,
                      std::string(),
@@ -47,7 +48,7 @@ void CloudPrintURLFetcher::StartPostRequest(
     const std::string& post_data,
     const std::string& additional_headers) {
   StartRequestHelper(url,
-                     content::URLFetcher::POST,
+                     net::URLFetcher::POST,
                      delegate,
                      max_retries,
                      post_data_mime_type,
@@ -133,7 +134,7 @@ void CloudPrintURLFetcher::OnURLFetchComplete(
 
 void CloudPrintURLFetcher::StartRequestHelper(
     const GURL& url,
-    content::URLFetcher::RequestType request_type,
+    net::URLFetcher::RequestType request_type,
     Delegate* delegate,
     int max_retries,
     const std::string& post_data_mime_type,
@@ -149,7 +150,7 @@ void CloudPrintURLFetcher::StartRequestHelper(
   request_->SetMaxRetries(max_retries);
   delegate_ = delegate;
   SetupRequestHeaders();
-  if (request_type == content::URLFetcher::POST) {
+  if (request_type == net::URLFetcher::POST) {
     request_->SetUploadData(post_data_mime_type, post_data);
   }
 
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.h b/chrome/service/cloud_print/cloud_print_url_fetcher.h
index 92b988d..654b4e7 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher.h
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher.h
@@ -10,7 +10,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/public/common/url_fetcher.h"
+#include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 class GURL;
@@ -118,7 +118,7 @@ class CloudPrintURLFetcher
 
  private:
   void StartRequestHelper(const GURL& url,
-                          content::URLFetcher::RequestType request_type,
+                          net::URLFetcher::RequestType request_type,
                           Delegate* delegate,
                           int max_retries,
                           const std::string& post_data_mime_type,
@@ -126,10 +126,10 @@ class CloudPrintURLFetcher
                           const std::string& additional_headers);
   void SetupRequestHeaders();
 
-  scoped_ptr<content::URLFetcher> request_;
+  scoped_ptr<net::URLFetcher> request_;
   Delegate* delegate_;
   int num_retries_;
-  content::URLFetcher::RequestType request_type_;
+  net::URLFetcher::RequestType request_type_;
   std::string additional_headers_;
   std::string post_data_mime_type_;
   std::string post_data_;