summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-06 01:20:00 +0000
committertkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-06 01:20:00 +0000
commit07487b946aa0b8704214f7b3e595d9aa6908dcc1 (patch)
tree943005c2e3620f06a9f02da233aae5adbde3bc7a /webkit
parent2e3fb5e821d2735caedb72287ec7eed7683977d0 (diff)
downloadchromium_src-07487b946aa0b8704214f7b3e595d9aa6908dcc1.zip
chromium_src-07487b946aa0b8704214f7b3e595d9aa6908dcc1.tar.gz
chromium_src-07487b946aa0b8704214f7b3e595d9aa6908dcc1.tar.bz2
webkit_support: Implement WebKitClient::blobRegistry().
TEST=none BUG=none Review URL: http://codereview.chromium.org/3351007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/support/test_webkit_client.cc7
-rw-r--r--webkit/support/test_webkit_client.h5
2 files changed, 12 insertions, 0 deletions
diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc
index 3497377..cb176b1 100644
--- a/webkit/support/test_webkit_client.cc
+++ b/webkit/support/test_webkit_client.cc
@@ -42,6 +42,7 @@
#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_request_context.h"
+#include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h"
#include "v8/include/v8.h"
#if defined(OS_WIN)
@@ -105,6 +106,8 @@ TestWebKitClient::TestWebKitClient(bool unit_test_mode)
WebKit::WebDatabase::setObserver(&database_system_);
+ blob_registry_ = new TestShellWebBlobRegistryImpl();
+
file_utilities_.set_sandbox_enabled(false);
#if defined(OS_WIN)
@@ -151,6 +154,10 @@ WebKit::WebCookieJar* TestWebKitClient::cookieJar() {
return &cookie_jar_;
}
+WebKit::WebBlobRegistry* TestWebKitClient::blobRegistry() {
+ return blob_registry_.get();
+}
+
bool TestWebKitClient::sandboxEnabled() {
return true;
}
diff --git a/webkit/support/test_webkit_client.h b/webkit/support/test_webkit_client.h
index b35de56..8a0b3a4 100644
--- a/webkit/support/test_webkit_client.h
+++ b/webkit/support/test_webkit_client.h
@@ -14,6 +14,8 @@
#include "webkit/tools/test_shell/simple_webcookiejar_impl.h"
#include "webkit/tools/test_shell/test_shell_webmimeregistry_impl.h"
+class TestShellWebBlobRegistryImpl;
+
// An implementation of WebKitClient for tests.
class TestWebKitClient : public webkit_glue::WebKitClientImpl {
public:
@@ -25,6 +27,8 @@ class TestWebKitClient : public webkit_glue::WebKitClientImpl {
virtual WebKit::WebFileUtilities* fileUtilities();
virtual WebKit::WebSandboxSupport* sandboxSupport();
virtual WebKit::WebCookieJar* cookieJar();
+ virtual WebKit::WebBlobRegistry* blobRegistry();
+
virtual bool sandboxEnabled();
virtual WebKit::WebKitClient::FileHandle databaseOpenFile(
const WebKit::WebString& vfs_file_name, int desired_flags);
@@ -71,6 +75,7 @@ class TestWebKitClient : public webkit_glue::WebKitClientImpl {
SimpleAppCacheSystem appcache_system_;
SimpleDatabaseSystem database_system_;
SimpleWebCookieJarImpl cookie_jar_;
+ scoped_refptr<TestShellWebBlobRegistryImpl> blob_registry_;
WebURLLoaderMockFactory url_loader_factory_;
bool unit_test_mode_;