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

chrome/browser/ui/webui/options/chromeos/wallpaper_source.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/options/chromeos/wallpaper_source.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/debug/trace_event.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/ui_resources.h"
 #include "net/base/mime_util.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
 
 extern "C" {
 #include "third_party/zlib/zlib.h"
@@ skipping 64 matching lines @@
   int request_id_;
   // Buffer to store encoded image.
   scoped_refptr<base::RefCountedBytes> data_;
   // Original image to encode.
   SkBitmap image_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperEncodingOperation);
 };
 
 WallpaperImageSource::WallpaperImageSource()
-    : DataSource(chrome::kChromeUIWallpaperImageHost, NULL),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+    : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 WallpaperImageSource::~WallpaperImageSource() {
 }
 
+std::string WallpaperImageSource::GetSource() {
+  return chrome::kChromeUIWallpaperImageHost;
+}
+
 void WallpaperImageSource::StartDataRequest(const std::string& email,
                                             bool is_incognito,
                                             int request_id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   TRACE_EVENT_ASYNC_BEGIN0("SCREEN_LOCK", "GetUserWallpaperDataRequest",
                            request_id);
   CancelPendingEncodingOperation();
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
@@ skipping 42 matching lines @@
       base::Bind(&WallpaperImageSource::SendCurrentUserWallpaper,
                  weak_ptr_factory_.GetWeakPtr(), request_id, data),
       true /* task_is_slow */);
 };
 
 void WallpaperImageSource::CancelPendingEncodingOperation() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   // Set canceled flag of previous request to skip unneeded encoding.
   if (wallpaper_encoding_op_.get()) {
     wallpaper_encoding_op_->Cancel();
-    SendResponse(wallpaper_encoding_op_->request_id(), NULL);
+    url_data_source()->SendResponse(wallpaper_encoding_op_->request_id(), NULL);
     TRACE_EVENT_ASYNC_END0("SCREEN_LOCK", "GetUserWallpaper",
                            wallpaper_encoding_op_->request_id());
   }
 
   // Cancel reply callback for previous request.
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 void WallpaperImageSource::SendCurrentUserWallpaper(int request_id,
     scoped_refptr<base::RefCountedBytes> data) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  SendResponse(request_id, data);
+  url_data_source()->SendResponse(request_id, data);
   TRACE_EVENT_ASYNC_END0("SCREEN_LOCK", "GetUserWallpaper", request_id);
 }
 
 }  // namespace options
 }  // namespace chromeos