diff options
| author | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-01 06:08:27 +0000 |
|---|---|---|
| committer | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-01 06:08:27 +0000 |
| commit | 3d56c24f0ab43d2b85986c4d6c17543b9a5cfcf2 (patch) | |
| tree | 20be103316be4281a3b1c996f8779a75d3a9ad86 /webkit/support/test_webkit_client.cc | |
| parent | f37ec09b147ed275a671d07bdda7b43064479a89 (diff) | |
| download | chromium_src-3d56c24f0ab43d2b85986c4d6c17543b9a5cfcf2.zip chromium_src-3d56c24f0ab43d2b85986c4d6c17543b9a5cfcf2.tar.gz chromium_src-3d56c24f0ab43d2b85986c4d6c17543b9a5cfcf2.tar.bz2 | |
* Implement WebPluginPageDelete::GetCookieJar()
* Do not use WebURLLoaderMock for DRT
Unfortunately, r50382 (adding WebURLLoader mock) broke some plugin tests.
- WebPluginImpl::InitiateHTTPRequest() stores a mocked WebURLLoader to clients_.
- WebURLLoaderMock delegates some operations to its internal WebURLLoader.
- WebPluginImpl::GetClientInfoFromLoader(WebURLLoader*) compares the
specified pointer (non-mocked) to stored loader pointers (mocked).
TEST=Covered by LayoutTests
BUG=none
Review URL: http://codereview.chromium.org/2834031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support/test_webkit_client.cc')
| -rw-r--r-- | webkit/support/test_webkit_client.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc index 0959383..dc93685 100644 --- a/webkit/support/test_webkit_client.cc +++ b/webkit/support/test_webkit_client.cc @@ -52,7 +52,8 @@ using WebKit::WebScriptController; -TestWebKitClient::TestWebKitClient() { +TestWebKitClient::TestWebKitClient(bool unit_test_mode) + : unit_test_mode_(unit_test_mode) { v8::V8::SetCounterFunction(StatsTable::FindLocation); WebKit::initialize(this); @@ -194,6 +195,8 @@ void TestWebKitClient::prefetchHostName(const WebKit::WebString&) { } WebKit::WebURLLoader* TestWebKitClient::createURLLoader() { + if (!unit_test_mode_) + return webkit_glue::WebKitClientImpl::createURLLoader(); return url_loader_factory_.CreateURLLoader( webkit_glue::WebKitClientImpl::createURLLoader()); } |