Convert URLFetcher::Delegates to use an interface in content/public/common. Also remove the old U...

chrome/browser/safe_browsing/malware_details_cache.cc

 // Copyright (c) 2011 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.
 //
 // Implementation of the MalwareDetails class.
 
 #include "chrome/browser/safe_browsing/malware_details.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/md5.h"
 #include "base/string_util.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/safe_browsing/malware_details_cache.h"
 #include "chrome/browser/safe_browsing/report.pb.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/net/url_fetcher.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 using safe_browsing::ClientMalwareReportRequest;
 
 // Only send small files for now, a better strategy would use the size
 // of the whole report and the user's bandwidth.
@@ skipping 67 matching lines @@
 ClientMalwareReportRequest::Resource* MalwareDetailsCacheCollector::GetResource(
     const GURL& url) {
   safe_browsing::ResourceMap::iterator it = resources_->find(url.spec());
   if (it != resources_->end()) {
     return it->second.get();
   }
   return NULL;
 }
 
 void MalwareDetailsCacheCollector::OnURLFetchComplete(
-    const URLFetcher* source,
-    const GURL& url,
-    const net::URLRequestStatus& status,
-    int response_code,
-    const net::ResponseCookies& cookies,
-    const std::string& data) {
+    const URLFetcher* source) {
   DVLOG(1) << "OnUrlFetchComplete";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(current_fetch_.get());
-  if (status.status() != net::URLRequestStatus::SUCCESS &&
-      status.error() == net::ERR_CACHE_MISS) {
+  if (source->status().status() != net::URLRequestStatus::SUCCESS &&
+      source->status().error() == net::ERR_CACHE_MISS) {
     // Cache miss, skip this resource.
-    DVLOG(1) << "Cache miss for url: " << url;
+    DVLOG(1) << "Cache miss for url: " << source->url();
     AdvanceEntry();
     return;
   }
 
-  if (status.status() != net::URLRequestStatus::SUCCESS) {
+  if (source->status().status() != net::URLRequestStatus::SUCCESS) {
     // Some other error occurred, e.g. the request could have been cancelled.
-    DVLOG(1) << "Unsuccessful fetch: " << url;
+    DVLOG(1) << "Unsuccessful fetch: " << source->url();
     AdvanceEntry();
     return;
   }
 
   // Set the response headers and body to the right resource, which
   // might not be the same as the one we asked for.
   // For redirects, resources_it_->first != url.spec().
-  ClientMalwareReportRequest::Resource* resource = GetResource(url);
+  ClientMalwareReportRequest::Resource* resource = GetResource(source->url());
   if (!resource) {
-    DVLOG(1) << "Cannot find resource for url:" << url;
+    DVLOG(1) << "Cannot find resource for url:" << source->url();
     AdvanceEntry();
     return;
   }
 
   ReadResponse(resource, source);
+  std::string data;
+  source->GetResponseAsString(&data);
   ReadData(resource, data);
   AdvanceEntry();
 }
 
 void MalwareDetailsCacheCollector::ReadResponse(
     ClientMalwareReportRequest::Resource* pb_resource,
     const URLFetcher* source) {
   DVLOG(1) << "ReadResponse";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   net::HttpResponseHeaders* headers = source->response_headers();
@@ skipping 53 matching lines @@
       base::Bind(&MalwareDetailsCacheCollector::OpenEntry, this));
 }
 
 void MalwareDetailsCacheCollector::AllDone(bool success) {
   DVLOG(1) << "AllDone";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   *result_ = success;
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, callback_);
   callback_.Reset();
 }