Remove content::URLFetcherDelegate

chrome/browser/chrome_to_mobile_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_to_mobile_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 117 matching lines @@
 // Call this as a BlockingPoolTask to avoid the FILE thread.
 void CreateSnapshotFile(CreateSnapshotFileCallback callback) {
   FilePath snapshot;
   bool success = file_util::CreateTemporaryFile(&snapshot);
   content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
                                    base::Bind(callback, snapshot, success));
 }
 
 // Send snapshot file contents as POST data in a job submit request.
 // Call this as a BlockingPoolSequencedTask (before posting DeleteSnapshotFile).
-void SubmitSnapshotFile(content::URLFetcher* request,
+void SubmitSnapshotFile(net::URLFetcher* request,
                         const ChromeToMobileService::RequestData& data) {
   std::string file;
   if (file_util::ReadFileToString(data.snapshot_path, &file) && !file.empty()) {
     std::string post_data, mime_boundary;
     cloud_print::CreateMimeBoundaryForUpload(&mime_boundary);
     cloud_print::AddMultipartValueForUpload("printerid",
         UTF16ToUTF8(data.mobile_id), mime_boundary, std::string(), &post_data);
     cloud_print::AddMultipartValueForUpload("tag", GetJobString(data),
         mime_boundary, std::string(), &post_data);
     cloud_print::AddMultipartValueForUpload("title", UTF16ToUTF8(data.title),
@@ skipping 97 matching lines @@
   data.mobile_id = mobile_id;
   content::WebContents* web_contents =
       browser::FindLastActiveWithProfile(profile_)->GetSelectedWebContents();
   data.url = web_contents->GetURL();
   data.title = web_contents->GetTitle();
   data.snapshot_path = snapshot;
   bool send_snapshot = !snapshot.empty();
   data.snapshot_id = send_snapshot ? guid::GenerateGUID() : std::string();
   data.type = send_snapshot ? DELAYED_SNAPSHOT : URL;
 
-  content::URLFetcher* submit_url = CreateRequest(data);
+  net::URLFetcher* submit_url = CreateRequest(data);
   request_observer_map_[submit_url] = observer;
   submit_url->Start();
 
   if (send_snapshot) {
     LogMetric(SENDING_SNAPSHOT);
 
     data.type = SNAPSHOT;
-    content::URLFetcher* submit_snapshot = CreateRequest(data);
+    net::URLFetcher* submit_snapshot = CreateRequest(data);
     request_observer_map_[submit_snapshot] = observer;
     content::BrowserThread::PostBlockingPoolSequencedTask(
         data.snapshot_path.AsUTF8Unsafe(), FROM_HERE,
         base::Bind(&SubmitSnapshotFile, submit_snapshot, data));
   }
 }
 
 void ChromeToMobileService::DeleteSnapshot(const FilePath& snapshot) {
   DCHECK(snapshot.empty() || snapshots_.find(snapshot) != snapshots_.end());
   if (snapshots_.find(snapshot) != snapshots_.end()) {
@@ skipping 60 matching lines @@
   if (success && browser && browser->GetSelectedWebContents()) {
     // Generate the snapshot and have the observer be called back on completion.
     browser->GetSelectedWebContents()->GenerateMHTML(path,
         base::Bind(&Observer::SnapshotGenerated, observer));
   } else if (observer.get()) {
     // Signal snapshot generation failure.
     observer->SnapshotGenerated(FilePath(), 0);
   }
 }
 
-content::URLFetcher* ChromeToMobileService::CreateRequest(
+net::URLFetcher* ChromeToMobileService::CreateRequest(
   const RequestData& data) {
   bool get = data.type != SNAPSHOT;
   GURL service_url(cloud_print_url_->GetCloudPrintServiceURL());
-  content::URLFetcher* request = content::URLFetcher::Create(
+  net::URLFetcher* request = content::URLFetcher::Create(
       data.type == SEARCH ? GetSearchURL(service_url) :
                             GetSubmitURL(service_url, data),
       get ? content::URLFetcher::GET : content::URLFetcher::POST, this);
   request->SetRequestContext(profile_->GetRequestContext());
   request->SetMaxRetries(kMaxRetries);
   request->SetExtraRequestHeaders("Authorization: OAuth " +
       access_token_ + "\r\n" + cloud_print::kChromeCloudPrintProxyHeader);
   request->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                         net::LOAD_DO_NOT_SAVE_COOKIES);
   return request;
@@ skipping 150 matching lines @@
 
       // Ensure a second response is not sent after reporting failure below.
       request_observer_map_.erase(other);
       break;
     }
   }
 
   LogMetric(success ? SEND_SUCCESS : SEND_ERROR);
   observer->OnSendComplete(success);
 }