| Index: webkit/support/test_webkit_platform_support.cc
|
| diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc
|
| index ff844a530e80445a16c21fe1d6819874fabe1d22..1b97a80dc2c8a6b3edfbddef215f57906c232b1e 100644
|
| --- a/webkit/support/test_webkit_platform_support.cc
|
| +++ b/webkit/support/test_webkit_platform_support.cc
|
| @@ -44,13 +44,8 @@
|
| #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
|
| #include "webkit/support/gc_extension.h"
|
| #include "webkit/support/mock_webclipboard_impl.h"
|
| -#include "webkit/support/simple_appcache_system.h"
|
| #include "webkit/support/simple_database_system.h"
|
| -#include "webkit/support/simple_file_system.h"
|
| -#include "webkit/support/simple_resource_loader_bridge.h"
|
| #include "webkit/support/simple_socket_stream_bridge.h"
|
| -#include "webkit/support/simple_webcookiejar_impl.h"
|
| -#include "webkit/support/test_shell_request_context.h"
|
| #include "webkit/support/test_shell_webblobregistry_impl.h"
|
| #include "webkit/support/test_webmessageportchannel.h"
|
| #include "webkit/support/web_audio_device_mock.h"
|
| @@ -119,7 +114,6 @@ TestWebKitPlatformSupport::TestWebKitPlatformSupport(bool unit_test_mode,
|
| "using in-memory storage.";
|
| DCHECK(appcache_dir_.path().empty());
|
| }
|
| - SimpleAppCacheSystem::InitializeOnUIThread(appcache_dir_.path());
|
|
|
| WebKit::WebDatabase::setObserver(&database_system_);
|
|
|
| @@ -152,10 +146,6 @@ TestWebKitPlatformSupport::TestWebKitPlatformSupport(bool unit_test_mode,
|
| net::HttpCache::Mode cache_mode = net::HttpCache::NORMAL;
|
| net::CookieMonster::EnableFileScheme();
|
|
|
| - // Initializing with a default context, which means no on-disk cookie DB,
|
| - // and no support for directory listings.
|
| - SimpleResourceLoaderBridge::Init(base::FilePath(), cache_mode, true);
|
| -
|
| // Test shell always exposes the GC.
|
| webkit_glue::SetJavaScriptFlags(" --expose-gc");
|
| // Expose GCController to JavaScript.
|
| @@ -183,18 +173,10 @@ WebKit::WebSandboxSupport* TestWebKitPlatformSupport::sandboxSupport() {
|
| return NULL;
|
| }
|
|
|
| -WebKit::WebCookieJar* TestWebKitPlatformSupport::cookieJar() {
|
| - return &cookie_jar_;
|
| -}
|
| -
|
| WebKit::WebBlobRegistry* TestWebKitPlatformSupport::blobRegistry() {
|
| return blob_registry_.get();
|
| }
|
|
|
| -WebKit::WebFileSystem* TestWebKitPlatformSupport::fileSystem() {
|
| - return &file_system_;
|
| -}
|
| -
|
| WebKit::WebHyphenator* TestWebKitPlatformSupport::hyphenator() {
|
| return &hyphenator_;
|
| }
|
| @@ -433,7 +415,8 @@ void TestWebKitPlatformSupport::GetPlugins(
|
| webkit_glue::ResourceLoaderBridge*
|
| TestWebKitPlatformSupport::CreateResourceLoader(
|
| const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
|
| - return SimpleResourceLoaderBridge::Create(request_info);
|
| + NOTREACHED();
|
| + return NULL;
|
| }
|
|
|
| webkit_glue::WebSocketStreamHandleBridge*
|
|
|