Don't derive from ChromeURLDataManager::DataSource, and instead have these classes implement a dele…

chrome/browser/ui/webui/favicon_source.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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/favicon/favicon_service.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/cancelable_task_tracker.h"
+#include "content/public/browser/url_data_source_delegate.h"
 #include "ui/gfx/favicon_size.h"
 
 class Profile;
 
 // FaviconSource is the gateway between network-level chrome:
 // requests for favicons and the history backend that serves these.
-class FaviconSource : public ChromeURLDataManager::DataSource {
+class FaviconSource : public content::URLDataSourceDelegate {
  public:
   // Defines the type of icon the FaviconSource will provide.
   enum IconType {
     FAVICON,
     // Any available icon in the priority of TOUCH_ICON_PRECOMPOSED, TOUCH_ICON,
     // FAVICON, and default favicon.
     ANY
   };
 
   // |type| is the type of icon this FaviconSource will provide.
   FaviconSource(Profile* profile, IconType type);
 
-  // Constructor allowing the source name to be specified.
-  FaviconSource(Profile* profile,
-                IconType type,
-                const std::string& source_name);
-
-  // Called when the network layer has requested a resource underneath
-  // the path we registered.
+  // content::URLDataSourceDelegate implementation.
+  virtual std::string GetSource() OVERRIDE;
   virtual void StartDataRequest(const std::string& path,
                                 bool is_incognito,
                                 int request_id) OVERRIDE;
-
   virtual std::string GetMimeType(const std::string&) const OVERRIDE;
-
   virtual bool ShouldReplaceExistingSource() const OVERRIDE;
 
  protected:
   struct IconRequest {
     IconRequest()
       : request_id(0),
         request_path(""),
         size_in_dip(gfx::kFaviconSize),
         scale_factor(ui::SCALE_FACTOR_NONE) {
     }
@@ skipping 24 matching lines @@
 
  private:
   // Defines the allowed pixel sizes for requested favicons.
   enum IconSize {
     SIZE_16,
     SIZE_32,
     SIZE_64,
     NUM_SIZES
   };
 
-  void Init(Profile* profile, IconType type);
-
   // Called when favicon data is available from the history backend.
   void OnFaviconDataAvailable(
       const IconRequest& request,
       const history::FaviconBitmapResult& bitmap_result);
 
   // Sends the default favicon.
   void SendDefaultResponse(const IconRequest& request);
 
   CancelableTaskTracker cancelable_task_tracker_;
 
   // Raw PNG representations of favicons of each size to show when the favicon
   // database doesn't have a favicon for a webpage. Indexed by IconSize values.
   scoped_refptr<base::RefCountedMemory> default_favicons_[NUM_SIZES];
 
   // The history::IconTypes of icon that this FaviconSource handles.
   int icon_types_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_