Remove getters for HTML5 related objects from the ResourceContext interface. Half of them weren't u…

chrome/browser/ui/webui/chrome_url_data_manager_backend.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/chrome_url_data_manager_backend.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/view_blob_internals_job_factory.h"
 #include "chrome/browser/net/view_http_cache_job_factory.h"
 #include "chrome/browser/ui/webui/shared_resources_data_source.h"
 #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/public/browser/browser_thread.h"
 #include "googleurl/src/url_util.h"
 #include "grit/platform_locale_settings.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_file_job.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory.h"
+#include "webkit/appcache/appcache_service.h"
 #include "webkit/appcache/view_appcache_internals_job.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // X-WebKit-CSP is our development name for Content-Security-Policy.
 // TODO(tsepez) rename when Content-security-policy is done.
 // TODO(tsepez) remove unsafe-eval when bidichecker_packaged.js fixed.
 // TODO(tsepez) chrome-extension: permits the ChromeVox screen reader
@@ skipping 274 matching lines @@
 bool IsViewAppCacheInternalsURL(const GURL& url) {
   return url.SchemeIs(chrome::kChromeUIScheme) &&
          url.host() == chrome::kChromeUIAppCacheInternalsHost;
 }
 
 class ChromeProtocolHandler
     : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   ChromeProtocolHandler(
       ChromeURLDataManagerBackend* backend,
-      ChromeAppCacheService* appcache_service,
+      appcache::AppCacheService* appcache_service,
       webkit_blob::BlobStorageController* blob_storage_controller);
   ~ChromeProtocolHandler();
 
   virtual net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request) const OVERRIDE;
 
  private:
   // These members are owned by ProfileIOData, which owns this ProtocolHandler.
   ChromeURLDataManagerBackend* const backend_;
-  ChromeAppCacheService* const appcache_service_;
+  appcache::AppCacheService* const appcache_service_;
   webkit_blob::BlobStorageController* const blob_storage_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeProtocolHandler);
 };
 
 ChromeProtocolHandler::ChromeProtocolHandler(
     ChromeURLDataManagerBackend* backend,
-    ChromeAppCacheService* appcache_service,
+    appcache::AppCacheService* appcache_service,
     webkit_blob::BlobStorageController* blob_storage_controller)
     : backend_(backend),
       appcache_service_(appcache_service),
       blob_storage_controller_(blob_storage_controller) {}
 
 ChromeProtocolHandler::~ChromeProtocolHandler() {}
 
 net::URLRequestJob* ChromeProtocolHandler::MaybeCreateJob(
     net::URLRequest* request) const {
   DCHECK(request);
@@ skipping 28 matching lines @@
        i != data_sources_.end(); ++i) {
     i->second->backend_ = NULL;
   }
   data_sources_.clear();
 }
 
 // static
 net::URLRequestJobFactory::ProtocolHandler*
 ChromeURLDataManagerBackend::CreateProtocolHandler(
     ChromeURLDataManagerBackend* backend,
-    ChromeAppCacheService* appcache_service,
+    appcache::AppCacheService* appcache_service,
     webkit_blob::BlobStorageController* blob_storage_controller) {
   DCHECK(appcache_service);
   DCHECK(blob_storage_controller);
   DCHECK(backend);
   return new ChromeProtocolHandler(
       backend, appcache_service, blob_storage_controller);
 }
 
 void ChromeURLDataManagerBackend::AddDataSource(
     ChromeURLDataManager::DataSource* source) {
@@ skipping 177 matching lines @@
 
   return new URLRequestChromeJob(request, backend_);
 }
 
 }  // namespace
 
 net::URLRequestJobFactory::ProtocolHandler*
 CreateDevToolsProtocolHandler(ChromeURLDataManagerBackend* backend) {
   return new DevToolsJobFactory(backend);
 }