Chromium Code Reviews| Index: webkit/support/webkit_support.cc |
| diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc |
| index a9dbe95c05ac7c47aa5239b9c3e8538e9ed5d39a..d389b555c1435b66c210845e2b41749cc0f7638c 100644 |
| --- a/webkit/support/webkit_support.cc |
| +++ b/webkit/support/webkit_support.cc |
| @@ -71,11 +71,8 @@ |
| #include "webkit/renderer/media/webmediaplayer_ms.h" |
| #include "webkit/renderer/media/webmediaplayer_params.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" |
| @@ -173,10 +170,6 @@ class TestEnvironment { |
| shadow_platform_delegate)); |
| } |
| - ~TestEnvironment() { |
| - SimpleResourceLoaderBridge::Shutdown(); |
| - } |
| - |
| TestWebKitPlatformSupport* webkit_platform_support() const { |
| return webkit_platform_support_.get(); |
| } |
| @@ -431,11 +424,6 @@ WebKit::WebMediaPlayer* CreateMediaPlayer( |
| return CreateMediaPlayer(frame, url, client, NULL); |
| } |
| -WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
| - WebFrame*, WebKit::WebApplicationCacheHostClient* client) { |
| - return SimpleAppCacheSystem::CreateApplicationCacheHost(client); |
| -} |
| - |
| WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) { |
| return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace(); |
| } |
| @@ -779,7 +767,7 @@ void ClearAllDatabases() { |
| // Bridge for SimpleResourceLoaderBridge |
| void SetAcceptAllCookies(bool accept) { |
| - SimpleResourceLoaderBridge::SetAcceptAllCookies(accept); |
| + LOG(ERROR) << "XXX:" << accept; |
|
jamesr
2013/06/20 04:58:00
hmm, NOTREACHED() << accept; ?
scottmg
2013/06/20 05:04:32
Done.
|
| } |
| // Theme engine |
| @@ -812,23 +800,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; |