Repurpose NotificationBitmapFetcher to BitmapFetcher

chrome/browser/bitmap_fetcher.h

Index: chrome/browser/bitmap_fetcher.h
diff --git a/chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher.h b/chrome/browser/bitmap_fetcher.h
similarity index 70%
rename from chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher.h
rename to chrome/browser/bitmap_fetcher.h
index 7a268e6a22d2c4a59488dfaee85221bcaf6af659..7b12922c3eea676aa54d43f13ec1e3d6575ff7e6 100644
--- a/chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher.h
+++ b/chrome/browser/bitmap_fetcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_NOTIFICATIONS_SYNC_NOTIFIER_NOTIFICATION_BITMAP_FETCHER_H_
-#define CHROME_BROWSER_NOTIFICATIONS_SYNC_NOTIFIER_NOTIFICATION_BITMAP_FETCHER_H_
+#ifndef CHROME_BROWSER_BITMAP_FETCHER_H_
+#define CHROME_BROWSER_BITMAP_FETCHER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/image_decoder.h"
@@ -17,10 +17,8 @@ class URLFetcher;
 
 class Profile;
 
-namespace notifier {
-
-// A delegate interface for users of NotificationBitmapFetcher.
-class NotificationBitmapFetcherDelegate {
+// A delegate interface for users of BitmapFetcher.

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

Should this be in a namespace somewhere?

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

Put it into the chrome namespace.

+class BitmapFetcherDelegate {
  public:
   // This will be called when the bitmap has been requested, whether or not the
   // request succeeds.  |url| is the URL that was originally fetched so we can
@@ -28,17 +26,14 @@ class NotificationBitmapFetcherDelegate {
   virtual void OnFetchComplete(const GURL url, const SkBitmap* bitmap) = 0;
 
  protected:
-  virtual ~NotificationBitmapFetcherDelegate() {}
+  virtual ~BitmapFetcherDelegate() {}
 };
 
-class NotificationBitmapFetcher
-    : public net::URLFetcherDelegate,
-      public ImageDecoder::Delegate {
+class BitmapFetcher : public net::URLFetcherDelegate,
+                      public ImageDecoder::Delegate {
  public:
-  NotificationBitmapFetcher(
-      const GURL& url,
-      NotificationBitmapFetcherDelegate* delegate);
-  virtual ~NotificationBitmapFetcher();
+  BitmapFetcher(const GURL& url, BitmapFetcherDelegate* delegate);
+  virtual ~BitmapFetcher();
 
   GURL url() const { return url_; }
 
@@ -56,7 +51,8 @@ class NotificationBitmapFetcher
   // denotes the number of bytes received up to the call, and |total| is the
   // expected total size of the response (or -1 if not determined).
   virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
-                                          int64 current, int64 total) OVERRIDE;
+                                          int64 current,
+                                          int64 total) OVERRIDE;
 
   // Methods inherited from ImageDecoder::Delegate
 
@@ -74,11 +70,9 @@ class NotificationBitmapFetcher
   scoped_refptr<ImageDecoder> image_decoder_;
   const GURL url_;
   scoped_ptr<SkBitmap> bitmap_;
-  NotificationBitmapFetcherDelegate* const delegate_;
+  BitmapFetcherDelegate* const delegate_;
 
-  DISALLOW_COPY_AND_ASSIGN(NotificationBitmapFetcher);
+  DISALLOW_COPY_AND_ASSIGN(BitmapFetcher);
 };
 
-}  // namespace notifier
-
-#endif  // CHROME_BROWSER_NOTIFICATIONS_SYNC_NOTIFIER_NOTIFICATION_BITMAP_FETCHER_H_
+#endif  // CHROME_BROWSER_BITMAP_FETCHER_H_