Simplify WebUI data sources. Currently WebUI data sources implement a URLDataSourceDelegate interfa…

chrome/browser/ui/webui/ntp/thumbnail_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/ntp/thumbnail_source.h"
 
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/thumbnails/thumbnail_service.h"
 #include "chrome/browser/thumbnails/thumbnail_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 // Set ThumbnailService now as Profile isn't thread safe.
 ThumbnailSource::ThumbnailSource(Profile* profile)
     : thumbnail_service_(ThumbnailServiceFactory::GetForProfile(profile)) {
 }
 
 ThumbnailSource::~ThumbnailSource() {
 }
 
 std::string ThumbnailSource::GetSource() {
   return chrome::kChromeUIThumbnailHost;
 }
 
-void ThumbnailSource::StartDataRequest(const std::string& path,
-                                       bool is_incognito,
-                                       int request_id) {
+void ThumbnailSource::StartDataRequest(
+    const std::string& path,
+    bool is_incognito,
+    const content::URLDataSource::GotDataCallback& callback) {
   scoped_refptr<base::RefCountedMemory> data;
   if (thumbnail_service_->GetPageThumbnail(GURL(path), &data)) {
     // We have the thumbnail.
-    url_data_source()->SendResponse(request_id, data.get());
+    callback.Run(data.get());
   } else {
-    SendDefaultThumbnail(request_id);
+    callback.Run(default_thumbnail_);
   }
 }
 
 std::string ThumbnailSource::GetMimeType(const std::string&) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
 MessageLoop* ThumbnailSource::MessageLoopForRequestPath(
     const std::string& path) const {
   // TopSites can be accessed from the IO thread.
   return thumbnail_service_.get() ?
-      NULL : content::URLDataSourceDelegate::MessageLoopForRequestPath(path);
+      NULL : content::URLDataSource::MessageLoopForRequestPath(path);
 }
-
-void ThumbnailSource::SendDefaultThumbnail(int request_id) {
-  url_data_source()->SendResponse(request_id, default_thumbnail_);
-}