Revert 92668 - Remove more unnecessary ChromeURLRequestContext members.

chrome/browser/ui/webui/chrome_url_data_manager.cc

 // Copyright (c) 2011 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/chrome_url_data_manager.h"
 
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "content/browser/browser_thread.h"
 #include "grit/platform_locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 // static
 base::Lock ChromeURLDataManager::delete_lock_;
 
 // static
 ChromeURLDataManager::DataSources* ChromeURLDataManager::data_sources_ = NULL;
 
 // Invoked on the IO thread to do the actual adding of the DataSource.
 static void AddDataSourceOnIOThread(
-    const base::Callback<ChromeURLDataManagerBackend*(void)>& backend,
+    scoped_refptr<net::URLRequestContextGetter> context_getter,
     scoped_refptr<ChromeURLDataManager::DataSource> data_source) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  backend.Run()->AddDataSource(data_source.get());
+  static_cast<ChromeURLRequestContext*>(
+      context_getter->GetURLRequestContext())->
+      chrome_url_data_manager_backend()->AddDataSource(data_source.get());
 }
 
-ChromeURLDataManager::ChromeURLDataManager(
-      const base::Callback<ChromeURLDataManagerBackend*(void)>& backend)
-    : backend_(backend) {
+ChromeURLDataManager::ChromeURLDataManager(Profile* profile)
+    : profile_(profile) {
 }
 
 ChromeURLDataManager::~ChromeURLDataManager() {
 }
 
 void ChromeURLDataManager::AddDataSource(DataSource* source) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableFunction(AddDataSourceOnIOThread,
-                          backend_,
+                          make_scoped_refptr(profile_->GetRequestContext()),
                           make_scoped_refptr(source)));
 }
 
 // static
 void ChromeURLDataManager::DeleteDataSources() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DataSources sources;
   {
     base::AutoLock lock(delete_lock_);
     if (!data_sources_)
@@ skipping 103 matching lines @@
       base::i18n::IsRTL() ? "rtl" : "ltr");
 }
 
 void ChromeURLDataManager::DataSource::SendResponseOnIOThread(
     int request_id,
     scoped_refptr<RefCountedMemory> bytes) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (backend_)
     backend_->DataAvailable(request_id, bytes);
 }