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

chrome/browser/web_resource/web_resource_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/web_resource/web_resource_service.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/net/url_fetcher.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/common/url_fetcher_delegate.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
 class WebResourceService::WebResourceFetcher
-    : public URLFetcher::Delegate {
+    : public content::URLFetcherDelegate {
  public:
   explicit WebResourceFetcher(WebResourceService* web_resource_service) :
       ALLOW_THIS_IN_INITIALIZER_LIST(fetcher_factory_(this)),
       web_resource_service_(web_resource_service) {
   }
 
   // Delay initial load of resource data into cache so as not to interfere
   // with startup time.
   void StartAfterDelay(int64 delay_ms) {
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
@@ skipping 29 matching lines @@
     // Do not let url fetcher affect existing state in system context (by
     // setting cookies, for example).
     url_fetcher_->set_load_flags(net::LOAD_DISABLE_CACHE |
         net::LOAD_DO_NOT_SAVE_COOKIES);
     net::URLRequestContextGetter* url_request_context_getter =
         g_browser_process->system_request_context();
     url_fetcher_->set_request_context(url_request_context_getter);
     url_fetcher_->Start();
   }
 
-  // From URLFetcher::Delegate.
-  void OnURLFetchComplete(const URLFetcher* source,
-                          const GURL& url,
-                          const net::URLRequestStatus& status,
-                          int response_code,
-                          const net::ResponseCookies& cookies,
-                          const std::string& data) {
+  // From content::URLFetcherDelegate.
+  void OnURLFetchComplete(const URLFetcher* source) {
     // Delete the URLFetcher when this function exits.
     scoped_ptr<URLFetcher> clean_up_fetcher(url_fetcher_.release());
 
     // Don't parse data if attempt to download was unsuccessful.
     // Stop loading new web resource data, and silently exit.
-    if (!status.is_success() || (response_code != 200))
+    if (!source->status().is_success() || (source->response_code() != 200))
       return;
 
+    std::string data;
+    source->GetResponseAsString(&data);
     web_resource_service_->UpdateResourceCache(data);
     web_resource_service_->Release();
   }
 
  private:
   // So that we can delay our start so as not to affect start-up time; also,
   // so that we can schedule future cache updates.
   ScopedRunnableMethodFactory<WebResourceFetcher> fetcher_factory_;
 
   // The tool that fetches the url data from the server.
@@ skipping 189 matching lines @@
 }
 
 void WebResourceService::UpdateResourceCache(const std::string& json_data) {
   UnpackerClient* client = new UnpackerClient(this, json_data);
   client->Start();
 
   // Set cache update time in preferences.
   prefs_->SetString(last_update_time_pref_name_,
       base::DoubleToString(base::Time::Now().ToDoubleT()));
 }