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

chrome/browser/ui/webui/favicon_source.cc

 // 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.
 
 #include "chrome/browser/ui/webui/favicon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "grit/locale_settings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 FaviconSource::FaviconSource(Profile* profile, IconType type)
-    : DataSource(type == FAVICON ? chrome::kChromeUIFaviconHost :
-                     chrome::kChromeUITouchIconHost,
-                 MessageLoop::current()) {
-  Init(profile, type);
-}
-
-FaviconSource::FaviconSource(Profile* profile,
-                             IconType type,
-                             const std::string& source_name)
-    : DataSource(source_name, MessageLoop::current()) {
-  Init(profile, type);
+    : profile_(profile->GetOriginalProfile()),
+      icon_types_(type == FAVICON ? history::FAVICON :
+          history::TOUCH_PRECOMPOSED_ICON | history::TOUCH_ICON |
+          history::FAVICON) {
 }
 
 FaviconSource::~FaviconSource() {
 }
 
-void FaviconSource::Init(Profile* profile, IconType type) {
-  profile_ = profile->GetOriginalProfile();
-  icon_types_ = type == FAVICON ? history::FAVICON :
-      history::TOUCH_PRECOMPOSED_ICON | history::TOUCH_ICON |
-      history::FAVICON;
+std::string FaviconSource::GetSource() {
+  return icon_types_ == history::FAVICON ?
+      chrome::kChromeUIFaviconHost : chrome::kChromeUITouchIconHost;
 }
 
 void FaviconSource::StartDataRequest(const std::string& path,
                                      bool is_incognito,
                                      int request_id) {
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!favicon_service || path.empty()) {
     SendDefaultResponse(IconRequest(request_id,
                                     "",
@@ skipping 64 matching lines @@
         url = GURL(originalUrl).GetOrigin();
       } else {
         url = GURL(path);
       }
     }
 
     // Intercept requests for prepopulated pages.
     for (size_t i = 0; i < arraysize(history::kPrepopulatedPages); i++) {
       if (url.spec() ==
           l10n_util::GetStringUTF8(history::kPrepopulatedPages[i].url_id)) {
-        SendResponse(request_id,
+        url_data_source()->SendResponse(request_id,
             ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
                 history::kPrepopulatedPages[i].favicon_id,
                 scale_factor));
         return;
       }
     }
 
     favicon_service->GetRawFaviconForURL(
         FaviconService::FaviconForURLParams(
             profile_, url, icon_types_, size_in_dip),
@@ skipping 24 matching lines @@
   // No additional checks to locate the favicon resource in the base
   // implementation.
   return false;
 }
 
 void FaviconSource::OnFaviconDataAvailable(
     const IconRequest& request,
     const history::FaviconBitmapResult& bitmap_result) {
   if (bitmap_result.is_valid()) {
     // Forward the data along to the networking system.
-    SendResponse(request.request_id, bitmap_result.bitmap_data);
+    url_data_source()->SendResponse(
+        request.request_id, bitmap_result.bitmap_data);
   } else if (!HandleMissingResource(request)) {
     SendDefaultResponse(request);
   }
 }
 
 void FaviconSource::SendDefaultResponse(const IconRequest& icon_request) {
   int favicon_index;
   int resource_id;
   switch (icon_request.size_in_dip) {
     case 64:
@@ skipping 11 matching lines @@
   }
   base::RefCountedMemory* default_favicon = default_favicons_[favicon_index];
 
   if (!default_favicon) {
     ui::ScaleFactor scale_factor = icon_request.scale_factor;
     default_favicon = ResourceBundle::GetSharedInstance()
         .LoadDataResourceBytesForScale(resource_id, scale_factor);
     default_favicons_[favicon_index] = default_favicon;
   }
 
-  SendResponse(icon_request.request_id, default_favicon);
+  url_data_source()->SendResponse(icon_request.request_id, default_favicon);
 }