Repurpose NotificationBitmapFetcher to BitmapFetcher

chrome/browser/bitmap_fetcher.cc

Index: chrome/browser/bitmap_fetcher.cc
diff --git a/chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher.cc b/chrome/browser/bitmap_fetcher.cc
similarity index 64%
rename from chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher.cc
rename to chrome/browser/bitmap_fetcher.cc
index b4b50fa4ef6969520a4a6be6a708344bea7214e4..0d8f01ff440ab92350b931b7c6c69fddcb3778c2 100644
--- a/chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher.cc
+++ b/chrome/browser/bitmap_fetcher.cc
@@ -2,25 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher.h"
+#include "chrome/browser/bitmap_fetcher.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 
-namespace notifier {
-
-NotificationBitmapFetcher::NotificationBitmapFetcher(
-    const GURL& url,
-    NotificationBitmapFetcherDelegate* delegate)
+BitmapFetcher::BitmapFetcher(const GURL& url, BitmapFetcherDelegate* delegate)
     : url_(url), delegate_(delegate) {}
 
-NotificationBitmapFetcher::~NotificationBitmapFetcher() {}
+BitmapFetcher::~BitmapFetcher() {}
 
-void NotificationBitmapFetcher::Start(Profile* profile) {
-  url_fetcher_.reset(
-      net::URLFetcher::Create(url_, net::URLFetcher::GET, this));
+void BitmapFetcher::Start(Profile* profile) {
+  url_fetcher_.reset(net::URLFetcher::Create(url_, net::URLFetcher::GET, this));
   // The RequestContext is coming from the current profile.
   // TODO(petewil): Make sure this is the right profile to use.
   // It seems to work, but we might prefer to use a blank profile with
@@ -31,8 +26,7 @@ void NotificationBitmapFetcher::Start(Profile* profile) {
 
 // Methods inherited from URLFetcherDelegate.
 
-void NotificationBitmapFetcher::OnURLFetchComplete(
-    const net::URLFetcher* source) {
+void BitmapFetcher::OnURLFetchComplete(const net::URLFetcher* source) {

[Pete Williamson, 2014/02/11 03:41:11]

One thing that I never finished investigating that we should probably double
check before making this  general purpose class.  What happens if the fetch
times out?  I presume that URLFetcher handles the timeout, but I'm not certain,
it would be good to make certain.

[gone, 2014/02/11 05:32:07]

Should be handled since functions like URLFetcherCore::RetryOrCompleteUrlFetch()
exist.  It always seems to end up informing the Delegate that it's stopped
trying, which is why you check the status on line 32.

   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   if (source->GetStatus().status() != net::URLRequestStatus::SUCCESS) {
@@ -43,8 +37,8 @@ void NotificationBitmapFetcher::OnURLFetchComplete(
   std::string image_data;
   source->GetResponseAsString(&image_data);
   // Create an ImageDecoder with the data and assign it to the refptr.
-  image_decoder_ = new ImageDecoder(this, image_data,
-                                    ImageDecoder::DEFAULT_CODEC);
+  image_decoder_ =
+      new ImageDecoder(this, image_data, ImageDecoder::DEFAULT_CODEC);
 
   // Call start to begin decoding.  The ImageDecoder will call OnImageDecoded
   // with the data when it is done.
@@ -54,15 +48,16 @@ void NotificationBitmapFetcher::OnURLFetchComplete(
   image_decoder_->Start(task_runner);
 }
 
-void NotificationBitmapFetcher::OnURLFetchDownloadProgress(
-    const net::URLFetcher* source, int64 current, int64 total) {
+void BitmapFetcher::OnURLFetchDownloadProgress(const net::URLFetcher* source,
+                                               int64 current,
+                                               int64 total) {
   // Do nothing here.
 }
 
 // Methods inherited from ImageDecoder::Delegate.
 
-void NotificationBitmapFetcher::OnImageDecoded(
-    const ImageDecoder* decoder, const SkBitmap& decoded_image) {
+void BitmapFetcher::OnImageDecoded(const ImageDecoder* decoder,
+                                   const SkBitmap& decoded_image) {
   // Make a copy of the bitmap which we pass back to the UI thread.
   bitmap_.reset(new SkBitmap());
   decoded_image.deepCopyTo(bitmap_.get(), decoded_image.getConfig());
@@ -71,11 +66,7 @@ void NotificationBitmapFetcher::OnImageDecoded(
   delegate_->OnFetchComplete(url_, bitmap_.get());
 }
 
-void NotificationBitmapFetcher::OnDecodeImageFailed(
-    const ImageDecoder* decoder) {
-
+void BitmapFetcher::OnDecodeImageFailed(const ImageDecoder* decoder) {
   // Report failure.
   delegate_->OnFetchComplete(url_, NULL);
 }
-
-}  // namespace notifier