| Index: chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/chrome_url_data_manager_backend.cc (revision 92669)
|
| +++ chrome/browser/ui/webui/chrome_url_data_manager_backend.cc (working copy)
|
| @@ -19,7 +19,6 @@
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/url_constants.h"
|
| -#include "content/browser/appcache/chrome_appcache_service.h"
|
| #include "content/browser/browser_thread.h"
|
| #include "googleurl/src/url_util.h"
|
| #include "grit/platform_locale_settings.h"
|
| @@ -228,10 +227,8 @@
|
| class ChromeProtocolHandler
|
| : public net::URLRequestJobFactory::ProtocolHandler {
|
| public:
|
| - ChromeProtocolHandler(
|
| - ChromeURLDataManagerBackend* backend,
|
| - ChromeAppCacheService* appcache_service,
|
| - webkit_blob::BlobStorageController* blob_storage_controller);
|
| + ChromeProtocolHandler(ChromeURLDataManagerBackend* backend,
|
| + ChromeAppCacheService* appcache_service);
|
| ~ChromeProtocolHandler();
|
|
|
| virtual net::URLRequestJob* MaybeCreateJob(
|
| @@ -241,18 +238,15 @@
|
| // These members are owned by ProfileIOData, which owns this ProtocolHandler.
|
| ChromeURLDataManagerBackend* const backend_;
|
| ChromeAppCacheService* const appcache_service_;
|
| - webkit_blob::BlobStorageController* const blob_storage_controller_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromeProtocolHandler);
|
| };
|
|
|
| ChromeProtocolHandler::ChromeProtocolHandler(
|
| ChromeURLDataManagerBackend* backend,
|
| - ChromeAppCacheService* appcache_service,
|
| - webkit_blob::BlobStorageController* blob_storage_controller)
|
| + ChromeAppCacheService* appcache_service)
|
| : backend_(backend),
|
| - appcache_service_(appcache_service),
|
| - blob_storage_controller_(blob_storage_controller) {}
|
| + appcache_service_(appcache_service) {}
|
|
|
| ChromeProtocolHandler::~ChromeProtocolHandler() {}
|
|
|
| @@ -271,8 +265,7 @@
|
|
|
| // Next check for chrome://blob-internals/, which uses its own job type.
|
| if (ViewBlobInternalsJobFactory::IsSupportedURL(request->url()))
|
| - return ViewBlobInternalsJobFactory::CreateJobForRequest(
|
| - request, blob_storage_controller_);
|
| + return ViewBlobInternalsJobFactory::CreateJobForRequest(request);
|
|
|
| // Fall back to using a custom handler
|
| return new URLRequestChromeJob(request, backend_);
|
| @@ -297,13 +290,10 @@
|
| net::URLRequestJobFactory::ProtocolHandler*
|
| ChromeURLDataManagerBackend::CreateProtocolHandler(
|
| ChromeURLDataManagerBackend* backend,
|
| - ChromeAppCacheService* appcache_service,
|
| - webkit_blob::BlobStorageController* blob_storage_controller) {
|
| + ChromeAppCacheService* appcache_service) {
|
| DCHECK(appcache_service);
|
| - DCHECK(blob_storage_controller);
|
| DCHECK(backend);
|
| - return new ChromeProtocolHandler(
|
| - backend, appcache_service, blob_storage_controller);
|
| + return new ChromeProtocolHandler(backend, appcache_service);
|
| }
|
|
|
| void ChromeURLDataManagerBackend::AddDataSource(
|
|
|