| Index: webkit/support/webkit_support.cc
|
| diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
|
| index 0e0997fd77fe8ce8d6b0a88d49b5a4f31340b545..69da535339962e57f511c9daddb70e2dceb731b2 100644
|
| --- a/webkit/support/webkit_support.cc
|
| +++ b/webkit/support/webkit_support.cc
|
| @@ -62,11 +62,6 @@
|
| #include "webkit/renderer/appcache/web_application_cache_host_impl.h"
|
| #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
|
| #include "webkit/support/platform_support.h"
|
| -#include "webkit/support/simple_appcache_system.h"
|
| -#include "webkit/support/simple_database_system.h"
|
| -#include "webkit/support/simple_dom_storage_system.h"
|
| -#include "webkit/support/simple_file_system.h"
|
| -#include "webkit/support/simple_resource_loader_bridge.h"
|
| #include "webkit/support/test_webkit_platform_support.h"
|
| #include "webkit/support/test_webplugin_page_delegate.h"
|
| #include "webkit/support/web_layer_tree_view_impl_for_testing.h"
|
| @@ -150,10 +145,6 @@ class TestEnvironment {
|
| webkit_platform_support_.reset(new TestWebKitPlatformSupport);
|
| }
|
|
|
| - ~TestEnvironment() {
|
| - SimpleResourceLoaderBridge::Shutdown();
|
| - }
|
| -
|
| TestWebKitPlatformSupport* webkit_platform_support() const {
|
| return webkit_platform_support_.get();
|
| }
|
| @@ -326,15 +317,6 @@ WebPlugin* CreateWebPlugin(WebFrame* frame,
|
| frame, new_params, plugins.front().path);
|
| }
|
|
|
| -WebKit::WebApplicationCacheHost* CreateApplicationCacheHost(
|
| - WebFrame*, WebKit::WebApplicationCacheHostClient* client) {
|
| - return SimpleAppCacheSystem::CreateApplicationCacheHost(client);
|
| -}
|
| -
|
| -WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) {
|
| - return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace();
|
| -}
|
| -
|
| WebKit::WebString GetWebKitRootDir() {
|
| base::FilePath path = GetWebKitRootDirFilePath();
|
| std::string path_ascii = path.MaybeAsASCII();
|
| @@ -652,22 +634,6 @@ WebKit::WebURLRequest::ExtraData* CreateWebURLRequestExtraData(
|
| WebKit::WebString());
|
| }
|
|
|
| -// Bridge for SimpleDatabaseSystem
|
| -
|
| -void SetDatabaseQuota(int quota) {
|
| - SimpleDatabaseSystem::GetInstance()->SetDatabaseQuota(quota);
|
| -}
|
| -
|
| -void ClearAllDatabases() {
|
| - SimpleDatabaseSystem::GetInstance()->ClearAllDatabases();
|
| -}
|
| -
|
| -// Bridge for SimpleResourceLoaderBridge
|
| -
|
| -void SetAcceptAllCookies(bool accept) {
|
| - SimpleResourceLoaderBridge::SetAcceptAllCookies(accept);
|
| -}
|
| -
|
| // Theme engine
|
| #if defined(OS_WIN) || defined(OS_MACOSX)
|
|
|
| @@ -698,23 +664,6 @@ WebURL GetDevToolsPathAsURL() {
|
| return net::FilePathToFileURL(devToolsPath);
|
| }
|
|
|
| -// FileSystem
|
| -void OpenFileSystem(WebFrame* frame,
|
| - WebKit::WebFileSystemType type,
|
| - long long size, bool create, WebFileSystemCallbacks* callbacks) {
|
| - SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>(
|
| - test_environment->webkit_platform_support()->fileSystem());
|
| - fileSystem->OpenFileSystem(frame, type, size, create, callbacks);
|
| -}
|
| -
|
| -void DeleteFileSystem(WebFrame* frame,
|
| - WebKit::WebFileSystemType type,
|
| - WebFileSystemCallbacks* callbacks) {
|
| - SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>(
|
| - test_environment->webkit_platform_support()->fileSystem());
|
| - fileSystem->DeleteFileSystem(frame, type, callbacks);
|
| -}
|
| -
|
| WebKit::WebString RegisterIsolatedFileSystem(
|
| const WebKit::WebVector<WebKit::WebString>& filenames) {
|
| fileapi::IsolatedContext::FileInfoSet files;
|
|
|