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

chrome/browser/chromeos/login/profile_image_downloader.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/chromeos/login/profile_image_downloader.h"
 
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/net/url_fetcher.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 #include "skia/ext/image_operations.h"
 
 namespace chromeos {
 
@@ skipping 115 matching lines @@
       ProfileManager::GetDefaultProfile()->GetRequestContext());
   if (!auth_token_.empty()) {
     user_entry_fetcher_->set_extra_request_headers(
         base::StringPrintf(kAuthorizationHeader, auth_token_.c_str()));
   }
   user_entry_fetcher_->Start();
 }
 
 ProfileImageDownloader::~ProfileImageDownloader() {}
 
-void ProfileImageDownloader::OnURLFetchComplete(
-    const URLFetcher* source,
-    const GURL& url,
-    const net::URLRequestStatus& status,
-    int response_code,
-    const net::ResponseCookies& cookies,
-    const std::string& data) {
+void ProfileImageDownloader::OnURLFetchComplete(const URLFetcher* source) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (response_code != 200) {
-    LOG(ERROR) << "Response code is " << response_code;
-    LOG(ERROR) << "Url is " << url.spec();
+  std::string data;
+  CHECK(source->GetResponseAsString(&data));
+  if (source->response_code() != 200) {
+    LOG(ERROR) << "Response code is " << source->response_code();
+    LOG(ERROR) << "Url is " << source->url().spec();
     LOG(ERROR) << "Data is " << data;
     if (delegate_)
       delegate_->OnDownloadFailure();
     return;
   }
 
   if (source == user_entry_fetcher_.get()) {
     std::string image_url = GetProfileImageURL(data);
     if (image_url.empty()) {
       if (delegate_)
         delegate_->OnDownloadFailure();
       return;
     }
     VLOG(1) << "Fetching profile image...";
     profile_image_fetcher_.reset(
         new URLFetcher(GURL(image_url), URLFetcher::GET, this));
     profile_image_fetcher_->set_request_context(
         ProfileManager::GetDefaultProfile()->GetRequestContext());
     if (!auth_token_.empty()) {
       profile_image_fetcher_->set_extra_request_headers(
           base::StringPrintf(kAuthorizationHeader, auth_token_.c_str()));
     }
     profile_image_fetcher_->Start();
   } else if (source == profile_image_fetcher_.get()) {
     VLOG(1) << "Decoding the image...";
-    scoped_refptr<ImageDecoder> image_decoder = new ImageDecoder(this, data);
+    scoped_refptr<ImageDecoder> image_decoder = new ImageDecoder(
+        this, data);
     image_decoder->Start();
   }
 }
 
 void ProfileImageDownloader::OnImageDecoded(const ImageDecoder* decoder,
                                             const SkBitmap& decoded_image) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   SkBitmap resized_image = skia::ImageOperations::Resize(
       decoded_image,
       skia::ImageOperations::RESIZE_BEST,
@@ skipping 27 matching lines @@
   } else {
     if (token_details->service() == GaiaConstants::kPicasaService) {
       LOG(WARNING) << "ProfileImageDownloader: token request failed";
       if (delegate_)
         delegate_->OnDownloadFailure();
     }
   }
 }
 
 }  // namespace chromeos