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

chrome/browser/ui/webui/options/chromeos/user_image_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/user_image_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/url_parse.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace {
 
 // Animated key is used in user image URL requests to specify that
@@ skipping 56 matching lines @@
 
 UserImageSource::UserImageSource() {
 }
 
 UserImageSource::~UserImageSource() {}
 
 std::string UserImageSource::GetSource() {
   return chrome::kChromeUIUserImageHost;
 }
 
-void UserImageSource::StartDataRequest(const std::string& path,
-                                       bool is_incognito,
-                                       int request_id) {
+void UserImageSource::StartDataRequest(
+    const std::string& path,
+    bool is_incognito,
+    const content::URLDataSource::GotDataCallback& callback) {
   std::string email;
   bool is_image_animated = false;
   ui::ScaleFactor scale_factor;
   GURL url(chrome::kChromeUIUserImageURL + path);
   ParseRequest(url, &email, &is_image_animated, &scale_factor);
-  url_data_source()->SendResponse(
-      request_id,
-      GetUserImage(email, is_image_animated, scale_factor));
+  callback.Run(GetUserImage(email, is_image_animated, scale_factor));
 }
 
 std::string UserImageSource::GetMimeType(const std::string& path) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   std::string email;
   bool is_image_animated = false;
   ui::ScaleFactor scale_factor;
 
   GURL url(chrome::kChromeUIUserImageURL + path);
   ParseRequest(url, &email, &is_image_animated, &scale_factor);
 
   if (is_image_animated) {
     const chromeos::User* user = chromeos::UserManager::Get()->FindUser(email);
     if (user && user->has_animated_image())
       return "image/gif";
   }
   return "image/png";
 }
 
 }  // namespace options
 }  // namespace chromeos