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

chrome/browser/ui/webui/fileicon_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/fileicon_source.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/time_format.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
@@ skipping 57 matching lines @@
        iter != parameters.end(); ++iter) {
     if (icon_size && iter->first == kIconSize)
       *icon_size = SizeStringToIconSize(iter->second);
     else if (scale_factor && iter->first == kScaleFactor)
       web_ui_util::ParseScaleFactor(iter->second, scale_factor);
   }
 }
 
 }  // namespace
 
+FileIconSource::IconRequestDetails::IconRequestDetails() {
+}
+
+FileIconSource::IconRequestDetails::~IconRequestDetails() {
+}
+
 FileIconSource::FileIconSource() {}
 
 FileIconSource::~FileIconSource() {}
 
-void FileIconSource::FetchFileIcon(const FilePath& path,
-                                   ui::ScaleFactor scale_factor,
-                                   IconLoader::IconSize icon_size,
-                                   int request_id) {
+void FileIconSource::FetchFileIcon(
+    const FilePath& path,
+    ui::ScaleFactor scale_factor,
+    IconLoader::IconSize icon_size,
+    const content::URLDataSource::GotDataCallback& callback) {
   IconManager* im = g_browser_process->icon_manager();
   gfx::Image* icon = im->LookupIcon(path, icon_size);
 
   if (icon) {
     scoped_refptr<base::RefCountedBytes> icon_data(new base::RefCountedBytes);
     gfx::PNGCodec::EncodeBGRASkBitmap(
         icon->ToImageSkia()->GetRepresentation(scale_factor).sk_bitmap(),
         false, &icon_data->data());
 
-    url_data_source()->SendResponse(request_id, icon_data);
+    callback.Run(icon_data);
   } else {
     // Attach the ChromeURLDataManager request ID to the history request.
     IconRequestDetails details;
-    details.request_id = request_id;
+    details.callback = callback;
     details.scale_factor = scale_factor;
 
     // Icon was not in cache, go fetch it slowly.
     im->LoadIcon(path,
                  icon_size,
                  base::Bind(&FileIconSource::OnFileIconDataAvailable,
                             base::Unretained(this), details),
                  &cancelable_task_tracker_);
   }
 }
 
 std::string FileIconSource::GetSource() {
   return kFileIconPath;
 }
 
-void FileIconSource::StartDataRequest(const std::string& url_path,
-                                      bool is_incognito,
-                                      int request_id) {
+void FileIconSource::StartDataRequest(
+    const std::string& url_path,
+    bool is_incognito,
+    const content::URLDataSource::GotDataCallback& callback) {
   std::string query;
   FilePath file_path;
   ui::ScaleFactor scale_factor;
   IconLoader::IconSize icon_size;
   GetFilePathAndQuery(url_path, &file_path, &query);
   ParseQueryParams(query, &scale_factor, &icon_size);
-  FetchFileIcon(file_path, scale_factor, icon_size, request_id);
+  FetchFileIcon(file_path, scale_factor, icon_size, callback);
 }
 
 std::string FileIconSource::GetMimeType(const std::string&) const {
   // Rely on image decoder inferring the correct type.
   return std::string();
 }
 
 void FileIconSource::OnFileIconDataAvailable(const IconRequestDetails& details,
                                              gfx::Image* icon) {
   if (icon) {
     scoped_refptr<base::RefCountedBytes> icon_data(new base::RefCountedBytes);
     gfx::PNGCodec::EncodeBGRASkBitmap(
         icon->ToImageSkia()->GetRepresentation(details.scale_factor)
             .sk_bitmap(),
         false,
         &icon_data->data());
 
-    url_data_source()->SendResponse(details.request_id, icon_data);
+    details.callback.Run(icon_data);
   } else {
     // TODO(glen): send a dummy icon.
-    url_data_source()->SendResponse(details.request_id, NULL);
+    details.callback.Run(NULL);
   }
 }