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

content/browser/appcache/chrome_appcache_service_unittest.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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
+#include "content/test/test_browser_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/appcache/appcache_database.h"
 #include "webkit/appcache/appcache_storage_impl.h"
 #include "webkit/appcache/appcache_test_helper.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
 #include <set>
 
 using content::BrowserThread;
 using content::BrowserThreadImpl;
@@ skipping 36 matching lines @@
   ScopedTempDir temp_dir_;
   const GURL kProtectedManifestURL;
   const GURL kNormalManifestURL;
   const GURL kSessionOnlyManifestURL;
 
  private:
   BrowserThreadImpl file_thread_;
   BrowserThreadImpl file_user_blocking_thread_;
   BrowserThreadImpl cache_thread_;
   BrowserThreadImpl io_thread_;
+  TestBrowserContext browser_context_;
 };
 
 scoped_refptr<ChromeAppCacheService>
 ChromeAppCacheServiceTest::CreateAppCacheService(
     const FilePath& appcache_path,
     bool init_storage) {
   scoped_refptr<ChromeAppCacheService> appcache_service =
       new ChromeAppCacheService(NULL);
-  content::ResourceContext* resource_context = NULL;
   scoped_refptr<quota::MockSpecialStoragePolicy> mock_policy =
       new quota::MockSpecialStoragePolicy;
   mock_policy->AddProtected(kProtectedManifestURL.GetOrigin());
   mock_policy->AddSessionOnly(kSessionOnlyManifestURL.GetOrigin());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ChromeAppCacheService::InitializeOnIOThread,
-                 appcache_service.get(), appcache_path, resource_context,
-                 mock_policy));
+                 appcache_service.get(), appcache_path,
+                 browser_context_.GetResourceContext(), mock_policy));
   // Steps needed to initialize the storage of AppCache data.
   message_loop_.RunAllPending();
   if (init_storage) {
     appcache::AppCacheStorageImpl* storage =
         static_cast<appcache::AppCacheStorageImpl*>(
             appcache_service->storage());
     storage->database_->db_connection();
     storage->disk_cache();
     message_loop_.RunAllPending();
   }
@@ skipping 126 matching lines @@
   EXPECT_TRUE(origins.find(kNormalManifestURL.GetOrigin()) != origins.end());
   EXPECT_TRUE(origins.find(kSessionOnlyManifestURL.GetOrigin()) !=
               origins.end());
 
   // Delete and let cleanup tasks run prior to returning.
   appcache_service = NULL;
   message_loop_.RunAllPending();
 }
 
 }  // namespace appcache