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

chrome/browser/ui/webui/chrome_web_ui_data_source.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_DATA_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_DATA_SOURCE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "content/public/browser/url_data_source_delegate.h"
 
 // A data source that can help with implementing the common operations
 // needed by the chrome WEBUI settings/history/downloads pages.
 // DO NOT DERIVE FROM THIS CLASS! http://crbug.com/169170
-class ChromeWebUIDataSource : public ChromeURLDataManager::DataSource {
+class ChromeWebUIDataSource : public URLDataSource,
+                              public content::URLDataSourceDelegate {
  public:
   // Used as a parameter to GotDataCallback. The caller has to run this callback
   // with the result for the path that they filtered, passing ownership of the
   // memory.
   typedef base::Callback<void(base::RefCountedMemory*)> GotDataCallback;
 
   // Used by SetRequestFilter. The string parameter is the path of the request.
   // If the callee doesn't want to handle the data, false is returned. Otherwise
   // true is returned and the GotDataCallback parameter is called either then or
   // asynchronously with the response.
   typedef base::Callback<bool(const std::string&, const GotDataCallback&)>
       HandleRequestCallback;
 
-  explicit ChromeWebUIDataSource(const std::string& source_name);
-  ChromeWebUIDataSource(const std::string& source_name, MessageLoop* loop);
+  explicit ChromeWebUIDataSource(const std::string& source_name);;
 
   // Adds a string keyed to its name to our dictionary.
   void AddString(const std::string& name, const string16& value);
 
   // Adds a string keyed to its name to our dictionary.
   void AddString(const std::string& name, const std::string& value);
 
   // Adds a localized string with resource |ids| keyed to its name to our
   // dictionary.
   void AddLocalizedString(const std::string& name, int ids);
@@ skipping 28 matching lines @@
 
  protected:
   virtual ~ChromeWebUIDataSource();
 
   // Completes a request by sending our dictionary of localized strings.
   void SendLocalizedStringsAsJSON(int request_id);
 
   // Completes a request by sending the file specified by |idr|.
   void SendFromResourceBundle(int request_id, int idr);
 
-  // ChromeURLDataManager
+  // content::URLDataSourceDelegate implementation:

[James Hawkins, 2013/01/14 18:53:54]

webui/ files use:

// content::URLDataSourceDelegate implementation.

[jam, 2013/01/14 19:21:18]

Done.

+  virtual std::string GetSource() OVERRIDE;
   virtual std::string GetMimeType(const std::string& path) const OVERRIDE;
   virtual void StartDataRequest(const std::string& path,
                                 bool is_incognito,
                                 int request_id) OVERRIDE;
 
  private:
+  std::string source_name_;

[James Hawkins, 2013/01/14 18:53:54]

nit: Document member variable.

Yes, none of the others are documented, and that is bad.

[jam, 2013/01/14 19:21:18]

Done.

   int default_resource_;
   bool json_js_format_v2_;
   std::string json_path_;
   std::map<std::string, int> path_to_idr_map_;
   DictionaryValue localized_strings_;
   HandleRequestCallback filter_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeWebUIDataSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_DATA_SOURCE_H_