summaryrefslogtreecommitdiffstats
path: root/webkit/support/webkit_support.cc
diff options
context:
space:
mode:
authorjcivelli@google.com <jcivelli@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 20:54:09 +0000
committerjcivelli@google.com <jcivelli@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 20:54:09 +0000
commit0fbd522d848313c647d2301990ea18973d887b69 (patch)
tree1cd783a8dacbfbf640661196edb6c92a6e7c16dd /webkit/support/webkit_support.cc
parenta74f123ad667cade1aa366bd423f6b68c99a2a78 (diff)
downloadchromium_src-0fbd522d848313c647d2301990ea18973d887b69.zip
chromium_src-0fbd522d848313c647d2301990ea18973d887b69.tar.gz
chromium_src-0fbd522d848313c647d2301990ea18973d887b69.tar.bz2
Adding a way to mock WebURLLoader in webkit_support.
This was originally in a CL in Webkit (https://bugs.webkit.org/show_bug.cgi?id=39456) but seems to make more sense in webkit_support. BUG=None TEST=None (the above CL makes use of this). Review URL: http://codereview.chromium.org/2749020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support/webkit_support.cc')
-rw-r--r--webkit/support/webkit_support.cc46
1 files changed, 37 insertions, 9 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index f0e984a..a98811d 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -59,7 +59,7 @@ class TestEnvironment {
SimpleResourceLoaderBridge::Shutdown();
}
- WebKit::WebKitClient* webkit_client() { return webkit_client_.get(); }
+ TestWebKitClient* webkit_client() { return webkit_client_.get(); }
#if defined(OS_WIN)
void set_theme_engine(WebKit::WebThemeEngine* engine) {
@@ -112,11 +112,7 @@ namespace webkit_support {
static TestEnvironment* test_environment;
-void SetUpTestEnvironment() {
- SetUpTestEnvironment(false);
-}
-
-void SetUpTestEnvironment(bool unit_test_mode) {
+static void SetUpTestEnvironmentImpl(bool unit_test_mode) {
base::EnableTerminationOnHeapCorruption();
// Initialize the singleton CommandLine with fixed values. Some code refer to
@@ -130,9 +126,9 @@ void SetUpTestEnvironment(bool unit_test_mode) {
const char* kFixedArguments[] = {"DumpRenderTree"};
CommandLine::Init(arraysize(kFixedArguments), kFixedArguments);
- BeforeInitialize();
- test_environment = new TestEnvironment(unit_test_mode);
- AfterInitialize();
+ webkit_support::BeforeInitialize();
+ webkit_support::test_environment = new TestEnvironment(unit_test_mode);
+ webkit_support::AfterInitialize();
if (!unit_test_mode) {
// Load ICU data tables. This has to run after TestEnvironment is created
// because on Linux, we need base::AtExitManager.
@@ -140,6 +136,18 @@ void SetUpTestEnvironment(bool unit_test_mode) {
}
}
+void SetUpTestEnvironment(bool unit_test_mode) {
+ SetUpTestEnvironment();
+}
+
+void SetUpTestEnvironment() {
+ SetUpTestEnvironmentImpl(false);
+}
+
+void SetUpTestEnvironmentForUnitTests() {
+ SetUpTestEnvironmentImpl(true);
+}
+
void TearDownTestEnvironment() {
// Flush any remaining messages before we kill ourselves.
// http://code.google.com/p/chromium/issues/detail?id=9500
@@ -218,6 +226,26 @@ WebKit::WebString GetWebKitRootDir() {
return WebKit::WebString::fromUTF8(WideToUTF8(path.ToWStringHack()).c_str());
}
+void RegisterMockedURL(const WebKit::WebURL& url,
+ const WebKit::WebURLResponse& response,
+ const WebKit::WebString& file_path) {
+ test_environment->webkit_client()->url_loader_factory()->
+ RegisterURL(url, response, file_path);
+}
+
+void UnregisterMockedURL(const WebKit::WebURL& url) {
+ test_environment->webkit_client()->url_loader_factory()->UnregisterURL(url);
+}
+
+void UnregisterAllMockedURLs() {
+ test_environment->webkit_client()->url_loader_factory()->UnregisterAllURLs();
+}
+
+void ServeAsynchronousMockedRequests() {
+ test_environment->webkit_client()->url_loader_factory()->
+ ServeAsynchronousRequests();
+}
+
// Wrapper for debug_util
bool BeingDebugged() {
return DebugUtil::BeingDebugged();