Apply recent changes of test_shell to webkit_support.

 - Enable some runtime WebKit flags
 - Use DumpRenderTreePasteboard
 - Use webkit_glue::WebFileSystemImpl
 - Use TestShellWebMimeRegistryImpl
 - Add webkit_support::CreateApplicationCacheHost()

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2038010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46899 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 6 deletions

diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc
index a3191e1..749fa80 100644
--- a/webkit/support/test_webkit_client.cc
+++ b/webkit/support/test_webkit_client.cc
@@ -13,6 +13,7 @@
 #include "media/base/media.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/WebGraphicsContext3D.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h"
@@ -67,7 +68,10 @@ TestWebKitClient::TestWebKitClient() {
   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);
 
   // Load libraries for media and enable the media player.
   bool enable_media = false;
@@ -100,6 +104,8 @@ TestWebKitClient::TestWebKitClient() {
 
   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);
@@ -133,6 +139,10 @@ WebKit::WebClipboard* TestWebKitClient::clipboard() {
   return &mock_clipboard_;
 }
 
+WebKit::WebFileSystem* TestWebKitClient::fileSystem() {
+  return &file_system_;
+}
+
 WebKit::WebSandboxSupport* TestWebKitClient::sandboxSupport() {
   return NULL;
 }
@@ -168,12 +178,6 @@ long long TestWebKitClient::databaseGetFileSize(
   return SimpleDatabaseSystem::GetInstance()->GetFileSize(vfs_file_name);
 }
 
-bool TestWebKitClient::getFileSize(const WebKit::WebString& path, long long& result) {
-  return file_util::GetFileSize(
-      webkit_glue::WebStringToFilePath(path),
-      reinterpret_cast<int64*>(&result));
-}
-
 unsigned long long TestWebKitClient::visitedLinkHash(const char* canonicalURL,
                                                      size_t length) {
   return 0;
@@ -239,3 +243,7 @@ WebKit::WebThemeEngine* TestWebKitClient::themeEngine() {
 WebKit::WebSharedWorkerRepository* TestWebKitClient::sharedWorkerRepository() {
   return NULL;
 }
+
+WebKit::WebGraphicsContext3D* TestWebKitClient::createGraphicsContext3D() {
+  return WebKit::WebGraphicsContext3D::createDefault();
+}