Repurpose NotificationBitmapFetcher to BitmapFetcher

chrome/browser/notifications/sync_notifier/synced_notification.h

 // 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.
 
 // This class represents the data for a single Synced Notification.
 // It should map 1-1 to all the data in synced_notification_sepcifics.proto,
 // and the data and render protobufs that the specifics protobuf contains.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_SYNC_NOTIFIER_SYNCED_NOTIFICATION_H_
 #define CHROME_BROWSER_NOTIFICATIONS_SYNC_NOTIFIER_SYNCED_NOTIFICATION_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher.h"
+#include "chrome/browser/bitmap_fetcher.h"
 #include "sync/api/sync_data.h"
 #include "sync/protocol/sync.pb.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 namespace sync_pb {
 class SyncedNotificationSpecifics;
 }
 
 class NotificationUIManager;
 class Profile;
 
 namespace notifier {
 
 class ChromeNotifierService;
 
-class SyncedNotification : public NotificationBitmapFetcherDelegate {
+class SyncedNotification : public chrome::BitmapFetcherDelegate {
  public:
   explicit SyncedNotification(const syncer::SyncData& sync_data);
 
   virtual ~SyncedNotification();
 
   enum ReadState {
     kUnread = 1,
     kRead = 2,
     kDismissed = 3,
   };
@@ skipping 58 matching lines @@
   // of the sync data.
   sync_pb::EntitySpecifics GetEntitySpecifics() const;
 
   // Write a notification to the console log.
   void LogNotification();
 
  private:
   // Helper function to mark a notification as read or dismissed.
   void SetReadState(const ReadState& read_state);
 
-  // Method inherited from NotificationBitmapFetcher delegate.
+  // Method inherited from BitmapFetcher delegate.
   virtual void OnFetchComplete(const GURL url, const SkBitmap* bitmap) OVERRIDE;
 
   // If this bitmap has a valid GURL, create a fetcher for it.
   void AddBitmapToFetchQueue(const GURL& gurl);
 
   // Check to see if we have responses for all the bitmaps we need.
   bool AreAllBitmapsFetched();
 
   sync_pb::SyncedNotificationSpecifics specifics_;
   NotificationUIManager* notification_manager_;
   ChromeNotifierService* notifier_service_;
   Profile* profile_;
   bool toast_state_;
-  ScopedVector<NotificationBitmapFetcher> fetchers_;
+  ScopedVector<chrome::BitmapFetcher> fetchers_;
   gfx::Image app_icon_bitmap_;
   gfx::Image sender_bitmap_;
   gfx::Image image_bitmap_;
   std::vector<gfx::Image> button_bitmaps_;
   bool app_icon_bitmap_fetch_pending_;
   bool sender_bitmap_fetch_pending_;
   bool image_bitmap_fetch_pending_;
   std::vector<bool> button_bitmaps_fetch_pending_;
 
 
   friend class SyncedNotificationTest;
 
   FRIEND_TEST_ALL_PREFIXES(SyncedNotificationTest, AddBitmapToFetchQueueTest);
   FRIEND_TEST_ALL_PREFIXES(SyncedNotificationTest, OnFetchCompleteTest);
   FRIEND_TEST_ALL_PREFIXES(SyncedNotificationTest, QueueBitmapFetchJobsTest);
   FRIEND_TEST_ALL_PREFIXES(SyncedNotificationTest, EmptyBitmapTest);
 
   DISALLOW_COPY_AND_ASSIGN(SyncedNotification);
 };
 
 }  // namespace notifier
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_SYNC_NOTIFIER_SYNCED_NOTIFICATION_H_