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

chrome/browser/ui/webui/chromeos/register_page_ui.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/chromeos/register_page_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/cancelable_task_tracker.h"
 #include "chrome/common/url_constants.h"
-#include "content/public/browser/url_data_source_delegate.h"
+#include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
 
@@ skipping 48 matching lines @@
   else if (network_lib->cellular_connecting())
     return kConnection3g;
   else if (network_lib->wimax_connecting())
     return kConnectionWimax;
   else
     return kUndefinedValue;
 }
 
 }  // namespace
 
-class RegisterPageUIHTMLSource : public content::URLDataSourceDelegate {
+class RegisterPageUIHTMLSource : public content::URLDataSource {
  public:
   RegisterPageUIHTMLSource();
 
-  // content::URLDataSourceDelegate implementation.
+  // content::URLDataSource implementation.
   virtual std::string GetSource() OVERRIDE;
-  virtual void StartDataRequest(const std::string& path,
-                                bool is_incognito,
-                                int request_id);
+  virtual void StartDataRequest(
+      const std::string& path,
+      bool is_incognito,
+      const content::URLDataSource::GotDataCallback& callback);
   virtual std::string GetMimeType(const std::string&) const {
     return "text/html";
   }
 
  private:
   ~RegisterPageUIHTMLSource() {}
 
   DISALLOW_COPY_AND_ASSIGN(RegisterPageUIHTMLSource);
 };
 
@@ skipping 38 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 RegisterPageUIHTMLSource::RegisterPageUIHTMLSource() {
 }
 
 std::string RegisterPageUIHTMLSource::GetSource() {
   return chrome::kChromeUIRegisterPageHost;
 }
 
-void RegisterPageUIHTMLSource::StartDataRequest(const std::string& path,
-                                                bool is_incognito,
-                                                int request_id) {
+void RegisterPageUIHTMLSource::StartDataRequest(
+    const std::string& path,
+    bool is_incognito,
+    const content::URLDataSource::GotDataCallback& callback) {
   // Make sure that chrome://register is available only during
   // OOBE wizard lifetime and when device has not been registered yet.
   if (!chromeos::WizardController::default_controller() ||
       chromeos::WizardController::IsDeviceRegistered()) {
     scoped_refptr<base::RefCountedBytes> empty_bytes(new base::RefCountedBytes);
-    url_data_source()->SendResponse(request_id, empty_bytes);
+    callback.Run(empty_bytes);
     return;
   }
 
   scoped_refptr<base::RefCountedMemory> html_bytes(
       ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
           IDR_HOST_REGISTRATION_PAGE_HTML));
 
-  url_data_source()->SendResponse(request_id, html_bytes);
+  callback.Run(html_bytes);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // RegisterPageHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 RegisterPageHandler::RegisterPageHandler() {
 }
 
@@ skipping 92 matching lines @@
 RegisterPageUI::RegisterPageUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   RegisterPageHandler* handler = new RegisterPageHandler();
   web_ui->AddMessageHandler(handler);
   RegisterPageUIHTMLSource* html_source = new RegisterPageUIHTMLSource();
 
   // Set up the chrome://register/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, html_source);
 }