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

chrome/browser/safe_browsing/download_protection_service.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.
 
 #include "chrome/browser/safe_browsing/download_protection_service.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/net/http_return.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/net/url_fetcher.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 namespace safe_browsing {
 
 const char DownloadProtectionService::kDownloadRequestUrl[] =
     "https://sb-ssl.google.com/safebrowsing/clientreport/download";
 
 DownloadProtectionService::DownloadInfo::DownloadInfo()
@@ skipping 34 matching lines @@
              download_requests_.begin();
          it != download_requests_.end(); ++it) {
       it->second.Run(SAFE);
     }
     STLDeleteContainerPairFirstPointers(download_requests_.begin(),
                                         download_requests_.end());
     download_requests_.clear();
   }
 }
 
-void DownloadProtectionService::OnURLFetchComplete(
-    const URLFetcher* source,
-    const GURL& url,
-    const net::URLRequestStatus& status,
-    int response_code,
-    const net::ResponseCookies& cookies,
-    const std::string& data) {
+void DownloadProtectionService::OnURLFetchComplete(const URLFetcher* source) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   scoped_ptr<const URLFetcher> s(source);  // will delete the URLFetcher object.
   if (download_requests_.find(source) != download_requests_.end()) {
     CheckDownloadCallback callback = download_requests_[source];
     download_requests_.erase(source);
     if (!enabled_) {
       // SafeBrowsing got disabled.  We can't do anything.  Note: the request
       // object will be deleted.
       RecordStats(REASON_SB_DISABLED);
       return;
     }
     DownloadCheckResultReason reason = REASON_MAX;
-    if (status.is_success() &&
-        RC_REQUEST_OK == response_code &&
-        data.size() > 0) {
-      // For now no matter what we'll always say the download is safe.
-      // TODO(noelutz): Parse the response body to see exactly what's going on.
-      reason = REASON_INVALID_RESPONSE_PROTO;
-    } else {
-      reason = REASON_SERVER_PING_FAILED;
+    reason = REASON_SERVER_PING_FAILED;
+    if (source->status().is_success() &&
+        RC_REQUEST_OK == source->response_code()) {
+      std::string data;
+      source->GetResponseAsString(&data);
+      if (data.size() > 0) {
+        // For now no matter what we'll always say the download is safe.
+        // TODO(noelutz): Parse the response body to see exactly what's going
+        // on.
+        reason = REASON_INVALID_RESPONSE_PROTO;
+      }
     }
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&DownloadProtectionService::EndCheckClientDownload,
                    this, SAFE, reason, callback));
   } else {
     NOTREACHED();
   }
 }
@@ skipping 97 matching lines @@
   RecordStats(reason);
   callback.Run(result);
 }
 
 void DownloadProtectionService::RecordStats(DownloadCheckResultReason reason) {
   UMA_HISTOGRAM_ENUMERATION("SBClientDownload.CheckDownloadStats",
                             reason,
                             REASON_MAX);
 }
 }  // namespace safe_browsing