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

chrome/browser/ui/webui/ntp/new_tab_ui.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_NTP_NEW_TAB_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_
 
 #include <map>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "content/public/browser/url_data_source_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_ui_controller.h"
 
 class GURL;
 class PrefServiceSyncable;
 class Profile;
 
+namespace base {
+class DictionaryValue;
+}
+
 // The WebContents used for the New Tab page.
 class NewTabUI : public content::WebUIController,
                  public content::NotificationObserver {
  public:
   explicit NewTabUI(content::WebUI* web_ui);
   virtual ~NewTabUI();
 
   static void RegisterUserPrefs(PrefServiceSyncable* prefs);
 
   // Returns whether or not to show apps pages.
@@ skipping 21 matching lines @@
   virtual void RenderViewReused(
       content::RenderViewHost* render_view_host) OVERRIDE;
 
   // Returns true if the bookmark bar can be displayed over this webui, detached
   // from the location bar.
   bool CanShowBookmarkBar() const;
 
   bool showing_sync_bubble() { return showing_sync_bubble_; }
   void set_showing_sync_bubble(bool showing) { showing_sync_bubble_ = showing; }
 
-  class NewTabHTMLSource : public ChromeURLDataManager::DataSource {
+  class NewTabHTMLSource : public content::URLDataSourceDelegate {
    public:
     explicit NewTabHTMLSource(Profile* profile);
 
-    // Called when the network layer has requested a resource underneath
-    // the path we registered.
+    // content::URLDataSourceDelegate implementation.
+    virtual std::string GetSource() OVERRIDE;
     virtual void StartDataRequest(const std::string& path,
                                   bool is_incognito,
                                   int request_id) OVERRIDE;
-
     virtual std::string GetMimeType(const std::string&) const OVERRIDE;
-
     virtual bool ShouldReplaceExistingSource() const OVERRIDE;
 
     // Adds |resource| to the source. |resource_id| is resource id or 0,
     // which means return empty data set. |mime_type| is mime type of the
     // resource.
     void AddResource(const char* resource,
                      const char *mime_type,
                      int resource_id);
 
    private:
@@ skipping 39 matching lines @@
 
   // If the sync promo NTP bubble is being shown.
   bool showing_sync_bubble_;
 
   PrefChangeRegistrar pref_change_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(NewTabUI);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_