Index: webkit/tools/test_shell/test_shell_webkit_init.h |
=================================================================== |
--- webkit/tools/test_shell/test_shell_webkit_init.h (revision 48989) |
+++ webkit/tools/test_shell/test_shell_webkit_init.h (working copy) |
@@ -5,32 +5,9 @@ |
#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_ |
#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_ |
-#include "base/file_util.h" |
-#include "base/path_service.h" |
-#include "base/platform_file.h" |
-#include "base/scoped_temp_dir.h" |
-#include "base/stats_counters.h" |
-#include "base/string_util.h" |
-#include "media/base/media.h" |
-#include "net/base/file_stream.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebData.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationServiceMock.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebIndexedDatabase.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebString.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebThemeEngine.h" |
-#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" |
-#include "webkit/database/vfs_backend.h" |
-#include "webkit/extensions/v8/gears_extension.h" |
-#include "webkit/extensions/v8/interval_extension.h" |
#include "webkit/glue/webclipboard_impl.h" |
#include "webkit/glue/webfilesystem_impl.h" |
#include "webkit/glue/webkit_glue.h" |
@@ -41,7 +18,6 @@ |
#include "webkit/tools/test_shell/simple_resource_loader_bridge.h" |
#include "webkit/tools/test_shell/simple_webcookiejar_impl.h" |
#include "webkit/tools/test_shell/test_shell_webmimeregistry_impl.h" |
-#include "v8/include/v8.h" |
#if defined(OS_WIN) |
#include "webkit/tools/test_shell/test_shell_webthemeengine.h" |
@@ -49,75 +25,14 @@ |
class TestShellWebKitInit : public webkit_glue::WebKitClientImpl { |
public: |
- explicit TestShellWebKitInit(bool layout_test_mode) { |
- v8::V8::SetCounterFunction(StatsTable::FindLocation); |
+ explicit TestShellWebKitInit(bool layout_test_mode); |
+ ~TestShellWebKitInit(); |
- WebKit::initialize(this); |
- WebKit::setLayoutTestMode(layout_test_mode); |
- WebKit::WebSecurityPolicy::registerURLSchemeAsLocal( |
- WebKit::WebString::fromUTF8("test-shell-resource")); |
- WebKit::WebSecurityPolicy::registerURLSchemeAsNoAccess( |
- WebKit::WebString::fromUTF8("test-shell-resource")); |
- WebKit::WebScriptController::enableV8SingleThreadMode(); |
- WebKit::WebScriptController::registerExtension( |
- extensions_v8::GearsExtension::Get()); |
- WebKit::WebScriptController::registerExtension( |
- extensions_v8::IntervalExtension::Get()); |
- WebKit::WebRuntimeFeatures::enableSockets(true); |
- WebKit::WebRuntimeFeatures::enableApplicationCache(true); |
- WebKit::WebRuntimeFeatures::enableDatabase(true); |
- WebKit::WebRuntimeFeatures::enableWebGL(true); |
- WebKit::WebRuntimeFeatures::enablePushState(true); |
- WebKit::WebRuntimeFeatures::enableNotifications(true); |
- WebKit::WebRuntimeFeatures::enableTouch(true); |
- WebKit::WebRuntimeFeatures::enableIndexedDatabase(true); |
- |
- // Load libraries for media and enable the media player. |
- FilePath module_path; |
- WebKit::WebRuntimeFeatures::enableMediaPlayer( |
- PathService::Get(base::DIR_MODULE, &module_path) && |
- media::InitializeMediaLibrary(module_path)); |
- |
- WebKit::WebRuntimeFeatures::enableGeolocation(true); |
- |
- // Construct and initialize an appcache system for this scope. |
- // A new empty temp directory is created to house any cached |
- // content during the run. Upon exit that directory is deleted. |
- // If we can't create a tempdir, we'll use in-memory storage. |
- if (!appcache_dir_.CreateUniqueTempDir()) { |
- LOG(WARNING) << "Failed to create a temp dir for the appcache, " |
- "using in-memory storage."; |
- DCHECK(appcache_dir_.path().empty()); |
- } |
- SimpleAppCacheSystem::InitializeOnUIThread(appcache_dir_.path()); |
- |
- WebKit::WebDatabase::setObserver(&database_system_); |
- |
- file_system_.set_sandbox_enabled(false); |
- |
-#if defined(OS_WIN) |
- // Ensure we pick up the default theme engine. |
- SetThemeEngine(NULL); |
-#endif |
- } |
- |
- ~TestShellWebKitInit() { |
- WebKit::shutdown(); |
- } |
- |
virtual WebKit::WebMimeRegistry* mimeRegistry() { |
return &mime_registry_; |
} |
- WebKit::WebClipboard* clipboard() { |
- // Mock out clipboard calls in layout test mode so that tests don't mess |
- // with each other's copies/pastes when running in parallel. |
- if (TestShell::layout_test_mode()) { |
- return &mock_clipboard_; |
- } else { |
- return &real_clipboard_; |
- } |
- } |
+ WebKit::WebClipboard* clipboard(); |
virtual WebKit::WebFileSystem* fileSystem() { |
return &file_system_; |
@@ -174,25 +89,7 @@ |
virtual void prefetchHostName(const WebKit::WebString&) { |
} |
- virtual WebKit::WebData loadResource(const char* name) { |
- if (!strcmp(name, "deleteButton")) { |
- // Create a red 30x30 square. |
- const char red_square[] = |
- "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52" |
- "\x00\x00\x00\x1e\x00\x00\x00\x1e\x04\x03\x00\x00\x00\xc9\x1e\xb3" |
- "\x91\x00\x00\x00\x30\x50\x4c\x54\x45\x00\x00\x00\x80\x00\x00\x00" |
- "\x80\x00\x80\x80\x00\x00\x00\x80\x80\x00\x80\x00\x80\x80\x80\x80" |
- "\x80\xc0\xc0\xc0\xff\x00\x00\x00\xff\x00\xff\xff\x00\x00\x00\xff" |
- "\xff\x00\xff\x00\xff\xff\xff\xff\xff\x7b\x1f\xb1\xc4\x00\x00\x00" |
- "\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\x00\x9a" |
- "\x9c\x18\x00\x00\x00\x17\x49\x44\x41\x54\x78\x01\x63\x98\x89\x0a" |
- "\x18\x50\xb9\x33\x47\xf9\xa8\x01\x32\xd4\xc2\x03\x00\x33\x84\x0d" |
- "\x02\x3a\x91\xeb\xa5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60" |
- "\x82"; |
- return WebKit::WebData(red_square, arraysize(red_square)); |
- } |
- return webkit_glue::WebKitClientImpl::loadResource(name); |
- } |
+ virtual WebKit::WebData loadResource(const char* name); |
virtual WebKit::WebString defaultLocale() { |
return ASCIIToUTF16("en-US"); |