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

chrome/browser/ui/webui/extensions/extension_icon_source.h

Index: chrome/browser/ui/webui/extensions/extension_icon_source.h
===================================================================
--- chrome/browser/ui/webui/extensions/extension_icon_source.h	(revision 176942)
+++ chrome/browser/ui/webui/extensions/extension_icon_source.h	(working copy)
@@ -14,7 +14,7 @@
 #include "chrome/common/cancelable_task_tracker.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
-#include "content/public/browser/url_data_source_delegate.h"
+#include "content/public/browser/url_data_source.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class ExtensionIconSet;
@@ -50,7 +50,7 @@
 //  2) If a 16px icon was requested, the favicon for extension's launch URL.
 //  3) The default extension / application icon if there are still no matches.
 //
-class ExtensionIconSource : public content::URLDataSourceDelegate,
+class ExtensionIconSource : public content::URLDataSource,
                             public base::SupportsWeakPtr<ExtensionIconSource> {
  public:
   explicit ExtensionIconSource(Profile* profile);
@@ -70,12 +70,13 @@
   // by |resource_id|.
   static SkBitmap* LoadImageByResourceId(int resource_id);
 
-  // content::URLDataSourceDelegate implementation.
+  // content::URLDataSource implementation.
   virtual std::string GetSource() OVERRIDE;
   virtual std::string GetMimeType(const std::string&) const OVERRIDE;
-  virtual void StartDataRequest(const std::string& path,
-                                bool is_incognito,
-                                int request_id) OVERRIDE;
+  virtual void StartDataRequest(
+      const std::string& path,
+      bool is_incognito,
+      const content::URLDataSource::GotDataCallback& callback) OVERRIDE;
 
  private:
   // Encapsulates the request parameters for |request_id|.
@@ -123,7 +124,9 @@
 
   // Parses and savse an ExtensionIconRequest for the URL |path| for the
   // specified |request_id|.
-  bool ParseData(const std::string& path, int request_id);
+  bool ParseData(const std::string& path,
+                 int request_id,
+                 const content::URLDataSource::GotDataCallback& callback);
 
   // Sends the default response to |request_id|, used for invalid requests.
   void SendDefaultResponse(int request_id);
@@ -131,6 +134,7 @@
   // Stores the parameters associated with the |request_id|, making them
   // as an ExtensionIconRequest via GetData.
   void SetData(int request_id,
+               const content::URLDataSource::GotDataCallback& callback,
                const extensions::Extension* extension,
                bool grayscale,
                int size,