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

chrome/browser/renderer_host/offline_resource_throttle.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/renderer_host/offline_resource_throttle.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/offline/offline_load_page.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host_delegate.h"
+#include "content/public/browser/resource_context.h"
 #include "content/public/browser/resource_throttle_controller.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
+#include "webkit/appcache/appcache_service.h"
 
 using content::BrowserThread;
+using content::ResourceContext;
 using content::WebContents;
 
 namespace {
 
 void ShowOfflinePage(
     int render_process_id,
     int render_view_id,
     const GURL& url,
     const chromeos::OfflineLoadPage::CompletionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 14 matching lines @@
       (new chromeos::OfflineLoadPage(web_contents, url, callback))->Show();
   }
 }
 
 }  // namespace
 
 OfflineResourceThrottle::OfflineResourceThrottle(
     int render_process_id,
     int render_view_id,
     net::URLRequest* request,
-    ChromeAppCacheService* appcache_service)
+    content::ResourceContext* resource_context)
     : render_process_id_(render_process_id),
       render_view_id_(render_view_id),
       request_(request),
-      appcache_service_(appcache_service) {
-  DCHECK(appcache_service_);
+      resource_context_(resource_context) {
+  DCHECK(resource_context);
 }
 
 OfflineResourceThrottle::~OfflineResourceThrottle() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!appcache_completion_callback_.IsCancelled())
     appcache_completion_callback_.Cancel();
 }
 
 void OfflineResourceThrottle::WillStartRequest(bool* defer) {
   if (!ShouldShowOfflinePage(request_->url()))
     return;
 
   DVLOG(1) << "WillStartRequest: this=" << this << ", url=" << request_->url();
 
   DCHECK(appcache_completion_callback_.IsCancelled());
 
   appcache_completion_callback_.Reset(
       base::Bind(&OfflineResourceThrottle::OnCanHandleOfflineComplete,
                  AsWeakPtr()));
-  appcache_service_->CanHandleMainResourceOffline(
-      request_->url(),
-      request_->first_party_for_cookies(),
-      appcache_completion_callback_.callback());
+  ResourceContext::GetAppCacheService(resource_context_)->
+      CanHandleMainResourceOffline(
+          request_->url(),
+          request_->first_party_for_cookies(),
+          appcache_completion_callback_.callback());
 
   *defer = true;
 }
 
 void OfflineResourceThrottle::OnBlockingPageComplete(bool proceed) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (proceed) {
     controller()->Resume();
   } else {
@@ skipping 25 matching lines @@
         base::Bind(
             &ShowOfflinePage,
             render_process_id_,
             render_view_id_,
             request_->url(),
             base::Bind(
                 &OfflineResourceThrottle::OnBlockingPageComplete,
                 AsWeakPtr())));
   }
 }