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

content/browser/renderer_host/resource_dispatcher_host.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 
 #include <set>
 #include <vector>
@@ skipping 72 matching lines @@
 #include "webkit/appcache/appcache_interceptor.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/deletable_file_reference.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 using content::BrowserThread;
 using content::GlobalRequestID;
+using content::ResourceContext;
 using content::ResourceResponse;
 using content::ResourceThrottle;
 using content::ThrottlingResourceHandler;
 using content::WebContents;
 using content::WorkerServiceImpl;
 using webkit_blob::DeletableFileReference;
 
 // ----------------------------------------------------------------------------
 
 namespace {
@@ skipping 431 matching lines @@
   if (iter != transferred_navigations_.end()) {
     deferred_request = iter->second;
     pending_requests_.erase(old_request_id);
     transferred_navigations_.erase(iter);
   }
 
   content::ResourceContext* resource_context = filter_->resource_context();
 
   // Might need to resolve the blob references in the upload data.
   if (request_data.upload_data) {
-    resource_context->GetBlobStorageContext()->controller()->
+    ResourceContext::GetBlobStorageController(resource_context)->
         ResolveBlobReferencesInUploadData(request_data.upload_data.get());
   }
 
   if (is_shutdown_ ||
       !ShouldServiceRequest(process_type, child_id, request_data)) {
     AbortRequestBeforeItStarts(filter_, sync_result, route_id, request_id);
     return;
   }
 
   const content::Referrer referrer(MaybeStripReferrer(request_data.referrer),
@@ skipping 154 matching lines @@
           ResourceType::IsFrame(request_data.resource_type),  // allow_download
           request_data.has_user_gesture,
           request_data.referrer_policy,
           resource_context);
   SetRequestInfo(request, extra_info);  // Request takes ownership.
 
   if (request->url().SchemeIs(chrome::kBlobScheme)) {
     // Hang on to a reference to ensure the blob is not released prior
     // to the job being started.
     webkit_blob::BlobStorageController* controller =
-        resource_context->GetBlobStorageContext()->controller();
+        ResourceContext::GetBlobStorageController(resource_context);
     extra_info->set_requested_blob_data(
         controller->GetBlobDataFromUrl(request->url()));
   }
 
   // Have the appcache associate its extra info with the request.
   appcache::AppCacheInterceptor::SetExtraRequestInfo(
-      request, resource_context->GetAppCacheService(), child_id,
+      request, ResourceContext::GetAppCacheService(resource_context), child_id,
       request_data.appcache_host_id, request_data.resource_type);
 
   if (deferred_request) {
     // This is a request that has been transferred from another process, so
     // resume it rather than continuing the regular procedure for starting a
     // request. Currently this is only done for redirects.
     GlobalRequestID global_id(extra_info->child_id(), extra_info->request_id());
     pending_requests_[global_id] = request;
     request->FollowDeferredRedirect();
   } else {
@@ skipping 1560 matching lines @@
   scoped_refptr<ResourceHandler> transferred_resource_handler(
       new DoomedResourceHandler(info->resource_handler()));
   info->set_resource_handler(transferred_resource_handler.get());
 }
 
 bool ResourceDispatcherHost::IsTransferredNavigation(
     const content::GlobalRequestID& transferred_request_id) const {
   return transferred_navigations_.find(transferred_request_id) !=
       transferred_navigations_.end();
 }