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

chrome/browser/safe_browsing/protocol_manager.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/protocol_manager.h"
 
 #ifndef NDEBUG
 #include "base/base64.h"
 #endif
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/task.h"
 #include "base/timer.h"
 #include "chrome/browser/safe_browsing/protocol_parser.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/env_vars.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/net/url_fetcher.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 using base::Time;
 using base::TimeDelta;
 
 // Maximum time, in seconds, from start up before we must issue an update query.
 static const int kSbTimerStartIntervalSec = 5 * 60;
@@ skipping 154 matching lines @@
       return;
     } else {
       initial_request_ = false;
     }
   }
 
   if (!request_.get())
     IssueUpdateRequest();
 }
 
-// URLFetcher::Delegate implementation -----------------------------------------
+// content::URLFetcherDelegate implementation ----------------------------------
 
 // All SafeBrowsing request responses are handled here.
 // TODO(paulg): Clarify with the SafeBrowsing team whether a failed parse of a
 //              chunk should retry the download and parse of that chunk (and
 //              what back off / how many times to try), and if that effects the
 //              update back off. For now, a failed parse of the chunk means we
 //              drop it. This isn't so bad because the next UPDATE_REQUEST we
 //              do will report all the chunks we have. If that chunk is still
 //              required, the SafeBrowsing servers will tell us to get it again.
-void SafeBrowsingProtocolManager::OnURLFetchComplete(
-    const URLFetcher* source,
-    const GURL& url,
-    const net::URLRequestStatus& status,
-    int response_code,
-    const net::ResponseCookies& cookies,
-    const std::string& data) {
+void SafeBrowsingProtocolManager::OnURLFetchComplete(const URLFetcher* source) {
   scoped_ptr<const URLFetcher> fetcher;
   bool parsed_ok = true;
   bool must_back_off = false;  // Reduce SafeBrowsing service query frequency.
 
   // See if this is a safebrowsing report fetcher. We don't take any action for
   // the response to those.
   std::set<const URLFetcher*>::iterator sit = safebrowsing_reports_.find(
       source);
   if (sit != safebrowsing_reports_.end()) {
     const URLFetcher* report = *sit;
     safebrowsing_reports_.erase(sit);
     delete report;
     return;
   }
 
   HashRequests::iterator it = hash_requests_.find(source);
   if (it != hash_requests_.end()) {
     // GetHash response.
     fetcher.reset(it->first);
     SafeBrowsingService::SafeBrowsingCheck* check = it->second;
     std::vector<SBFullHashResult> full_hashes;
     bool can_cache = false;
-    if (response_code == 200 || response_code == 204) {
+    if (source->response_code() == 200 || source->response_code() == 204) {
       // For tracking our GetHash false positive (204) rate, compared to real
       // (200) responses.
-      if (response_code == 200)
+      if (source->response_code() == 200)
         RecordGetHashResult(check->is_download, GET_HASH_STATUS_200);
       else
         RecordGetHashResult(check->is_download, GET_HASH_STATUS_204);
       can_cache = true;
       gethash_error_count_ = 0;
       gethash_back_off_mult_ = 1;
       bool re_key = false;
       SafeBrowsingProtocolParser parser;
-      parsed_ok = parser.ParseGetHash(data.data(),
-                                      static_cast<int>(data.length()),
-                                      client_key_,
-                                      &re_key,
-                                      &full_hashes);
+      std::string data;
+      source->GetResponseAsString(&data);
+      parsed_ok = parser.ParseGetHash(
+          data.data(),
+          static_cast<int>(data.length()),
+          client_key_,
+          &re_key,
+          &full_hashes);
       if (!parsed_ok) {
         // If we fail to parse it, we must still inform the SafeBrowsingService
         // so that it doesn't hold up the user's request indefinitely. Not sure
         // what to do at that point though!
         full_hashes.clear();
       } else {
         if (re_key)
           HandleReKey();
       }
     } else {
       HandleGetHashError(Time::Now());
-      if (status.status() == net::URLRequestStatus::FAILED) {
+      if (source->status().status() == net::URLRequestStatus::FAILED) {
         VLOG(1) << "SafeBrowsing GetHash request for: " << source->url()
-                << " failed with error: " << status.error();
+                << " failed with error: " << source->status().error();
       } else {
         VLOG(1) << "SafeBrowsing GetHash request for: " << source->url()
-                << " failed with error: " << response_code;
+                << " failed with error: " << source->response_code();
       }
     }
 
     // Call back the SafeBrowsingService with full_hashes, even if there was a
     // parse error or an error response code (in which case full_hashes will be
     // empty). We can't block the user regardless of the error status.
     sb_service_->HandleGetHashResults(check, full_hashes, can_cache);
 
     hash_requests_.erase(it);
   } else {
     // Update, chunk or key response.
     fetcher.reset(request_.release());
 
     if (request_type_ == UPDATE_REQUEST) {
       if (!fetcher.get()) {
         // We've timed out waiting for an update response, so we've cancelled
         // the update request and scheduled a new one. Ignore this response.
         return;
       }
 
       // Cancel the update response timeout now that we have the response.
       update_timer_.Stop();
     }
 
-    if (response_code == 200) {
+    if (source->response_code() == 200) {
       // We have data from the SafeBrowsing service.
-      parsed_ok = HandleServiceResponse(source->url(),
-                                        data.data(),
-                                        static_cast<int>(data.length()));
+      std::string data;
+      source->GetResponseAsString(&data);
+      parsed_ok = HandleServiceResponse(
+          source->url(), data.data(), static_cast<int>(data.length()));
       if (!parsed_ok) {
         VLOG(1) << "SafeBrowsing request for: " << source->url()
                 << " failed parse.";
         must_back_off = true;
         chunk_request_urls_.clear();
         UpdateFinished(false);
       }
 
       switch (request_type_) {
         case CHUNK_REQUEST:
@@ skipping 19 matching lines @@
         default:
           NOTREACHED();
           break;
       }
     } else {
       // The SafeBrowsing service error, or very bad response code: back off.
       must_back_off = true;
       if (request_type_ == CHUNK_REQUEST)
         chunk_request_urls_.clear();
       UpdateFinished(false);
-      if (status.status() == net::URLRequestStatus::FAILED) {
+      if (source->status().status() == net::URLRequestStatus::FAILED) {
         VLOG(1) << "SafeBrowsing request for: " << source->url()
-                << " failed with error: " << status.error();
+                << " failed with error: " << source->status().error();
       } else {
         VLOG(1) << "SafeBrowsing request for: " << source->url()
-                << " failed with error: " << response_code;
+                << " failed with error: " << source->response_code();
       }
     }
   }
 
   // Schedule a new update request if we've finished retrieving all the chunks
   // from the previous update. We treat the update request and the chunk URLs it
   // contains as an atomic unit as far as back off is concerned.
   if (chunk_request_urls_.empty() &&
       (request_type_ == CHUNK_REQUEST || request_type_ == UPDATE_REQUEST))
     ScheduleNextUpdate(must_back_off);
@@ skipping 470 matching lines @@
   if (!additional_query_.empty()) {
     if (next_url.find("?") != std::string::npos) {
       next_url.append("&");
     } else {
       next_url.append("?");
     }
     next_url.append(additional_query_);
   }
   return GURL(next_url);
 }