Move URLFetcherDelegate to net/ and split URLFetcher between net/ and content/

chrome/browser/safe_browsing/client_side_detection_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/safe_browsing/client_side_detection_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 90 matching lines @@
     // Refresh the model when the service is enabled.  This can happen when the
     // preference is toggled, or early during startup if the preference is
     // already enabled. In a lot of cases the model will be in the cache so it
     // won't actually be fetched from the network.
     // We delay the first model fetch to avoid slowing down browser startup.
     ScheduleFetchModel(kInitialClientModelFetchDelayMs);
   } else {
     // Cancel pending requests.
     model_fetcher_.reset();
     // Invoke pending callbacks with a false verdict.
-    for (std::map<const content::URLFetcher*, ClientReportInfo*>::iterator it =
+    for (std::map<const net::URLFetcher*, ClientReportInfo*>::iterator it =
              client_phishing_reports_.begin();
          it != client_phishing_reports_.end(); ++it) {
       ClientReportInfo* info = it->second;
       if (!info->callback.is_null())
         info->callback.Run(info->phishing_url, false);
     }
     STLDeleteContainerPairPointers(client_phishing_reports_.begin(),
                                    client_phishing_reports_.end());
     client_phishing_reports_.clear();
     cache_.clear();
@@ skipping 52 matching lines @@
       subnet[i] = ip_number[i] & mask[i];
     }
     if (it->second.count(crypto::SHA256HashString(subnet)) > 0) {
       return true;
     }
   }
   return false;
 }
 
 void ClientSideDetectionService::OnURLFetchComplete(
-    const content::URLFetcher* source) {
+    const net::URLFetcher* source) {
   std::string data;
   source->GetResponseAsString(&data);
   if (source == model_fetcher_.get()) {
     HandleModelResponse(
         source, source->GetURL(), source->GetStatus(),
         source->GetResponseCode(), source->GetCookies(), data);
   } else if (client_phishing_reports_.find(source) !=
              client_phishing_reports_.end()) {
     HandlePhishingVerdict(
         source, source->GetURL(), source->GetStatus(),
@@ skipping 120 matching lines @@
   fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE);
   fetcher->SetRequestContext(request_context_getter_.get());
   fetcher->SetUploadData("application/octet-stream", request_data);
   fetcher->Start();
 
   // Record that we made a request
   phishing_report_times_.push(base::Time::Now());
 }
 
 void ClientSideDetectionService::HandleModelResponse(
-    const content::URLFetcher* source,
+    const net::URLFetcher* source,
     const GURL& url,
     const net::URLRequestStatus& status,
     int response_code,
     const net::ResponseCookies& cookies,
     const std::string& data) {
   base::TimeDelta max_age;
   if (status.is_success() && net::HTTP_OK == response_code &&
       source->GetResponseHeaders() &&
       source->GetResponseHeaders()->GetMaxAgeValue(&max_age)) {
     model_max_age_.reset(new base::TimeDelta(max_age));
@@ skipping 20 matching lines @@
   } else {
     // The model is valid => replace the existing model with the new one.
     model_str_.assign(data);
     model_.swap(model);
     model_status = MODEL_SUCCESS;
   }
   EndFetchModel(model_status);
 }
 
 void ClientSideDetectionService::HandlePhishingVerdict(
-    const content::URLFetcher* source,
+    const net::URLFetcher* source,
     const GURL& url,
     const net::URLRequestStatus& status,
     int response_code,
     const net::ResponseCookies& cookies,
     const std::string& data) {
   ClientPhishingResponse response;
   scoped_ptr<ClientReportInfo> info(client_phishing_reports_[source]);
   bool is_phishing = false;
   if (status.is_success() && net::HTTP_OK == response_code &&
       response.ParseFromString(data)) {
@@ skipping 149 matching lines @@
     }
   }
   for (int i = 0; i < model.page_term_size(); ++i) {
     if (model.page_term(i) < 0 || model.page_term(i) > max_index) {
       return false;
     }
   }
   return true;
 }
 }  // namespace safe_browsing