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

chrome/browser/extensions/extension_data_deleter.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/extensions/extension_data_deleter.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/settings/settings_frontend.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
+#include "content/public/browser/resource_context.h"
 #include "net/base/completion_callback.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "webkit/appcache/appcache_service.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/database/database_util.h"
 #include "webkit/fileapi/file_system_context.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
+using content::ResourceContext;
 
 // static
 void ExtensionDataDeleter::StartDeleting(
     Profile* profile,
     const std::string& extension_id,
     const GURL& storage_origin,
     bool is_storage_isolated) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
   scoped_refptr<ExtensionDataDeleter> deleter =
@@ skipping 21 matching lines @@
           &ExtensionDataDeleter::DeleteDatabaseOnFileThread, deleter));
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(
           &ExtensionDataDeleter::DeleteFileSystemOnFileThread, deleter));
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
-          &ExtensionDataDeleter::DeleteAppcachesOnIOThread, deleter));
+          &ExtensionDataDeleter::DeleteAppcachesOnIOThread, deleter,
+          profile->GetResourceContext()));
 
   profile->GetExtensionService()->settings_frontend()->
       DeleteStorageSoon(extension_id);
 }
 
 ExtensionDataDeleter::ExtensionDataDeleter(
     Profile* profile,
     const std::string& extension_id,
     const GURL& storage_origin,
     bool is_storage_isolated)
     : extension_id_(extension_id) {
-  appcache_service_ = BrowserContext::GetAppCacheService(profile);
   webkit_context_ = BrowserContext::GetWebKitContext(profile);
   database_tracker_ = BrowserContext::GetDatabaseTracker(profile);
   // Pick the right request context depending on whether it's an extension,
   // isolated app, or regular app.
   if (storage_origin.SchemeIs(chrome::kExtensionScheme)) {
     extension_request_context_ = profile->GetRequestContextForExtensions();
   } else if (is_storage_isolated) {
     extension_request_context_ =
         profile->GetRequestContextForIsolatedApp(extension_id);
     isolated_app_path_ = profile->GetPath().
@@ skipping 43 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   file_system_context_->DeleteDataForOriginOnFileThread(storage_origin_);
 
   // TODO(creis): The following call fails because the request context is still
   // around, and holding open file handles in this directory.
   // See http://crbug.com/85127
   if (!isolated_app_path_.empty())
     file_util::Delete(isolated_app_path_, true);
 }
 
-void ExtensionDataDeleter::DeleteAppcachesOnIOThread() {
+void ExtensionDataDeleter::DeleteAppcachesOnIOThread(ResourceContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  appcache_service_->DeleteAppCachesForOrigin(
+  ResourceContext::GetAppCacheService(context)->DeleteAppCachesForOrigin(
       storage_origin_, net::CompletionCallback());
 }