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

chrome/browser/ui/webui/about_ui.h

Index: chrome/browser/ui/webui/about_ui.h
===================================================================
--- chrome/browser/ui/webui/about_ui.h	(revision 176942)
+++ chrome/browser/ui/webui/about_ui.h	(working copy)
@@ -9,29 +9,30 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/memory/weak_ptr.h"
-#include "content/public/browser/url_data_source_delegate.h"
+#include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_ui_controller.h"
 
 class Profile;
 
 // We expose this class because the OOBE flow may need to explicitly add the
 // chrome://terms source outside of the normal flow.
-class AboutUIHTMLSource : public content::URLDataSourceDelegate,
-                          public base::SupportsWeakPtr<AboutUIHTMLSource> {
+class AboutUIHTMLSource : public content::URLDataSource {
  public:
   // Construct a data source for the specified |source_name|.
   AboutUIHTMLSource(const std::string& source_name, Profile* profile);
 
-  // content::URLDataSourceDelegate implementation.
+  // content::URLDataSource implementation.
   virtual std::string GetSource() 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;
   virtual std::string GetMimeType(const std::string& path) const OVERRIDE;
 
   // Send the response data.
-  void FinishDataRequest(const std::string& html, int request_id);
+  void FinishDataRequest(
+      const std::string& html,
+      const content::URLDataSource::GotDataCallback& callback);
 
   Profile* profile() { return profile_; }