From db8f44cb41f402a9145bace60f6097410f46881d Mon Sep 17 00:00:00 2001 From: "ericroman@google.com" Date: Sat, 13 Dec 2008 04:52:01 +0000 Subject: Reverting 6966. this failed UI tests catastrophically Review URL: http://codereview.chromium.org/14103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6968 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/test_shell/plugin_tests.cc | 6 +++++- webkit/tools/test_shell/test_shell_request_context.cc | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'webkit/tools') diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc index 6b555a0..a7095dc 100644 --- a/webkit/tools/test_shell/plugin_tests.cc +++ b/webkit/tools/test_shell/plugin_tests.cc @@ -29,7 +29,11 @@ class PluginTest : public TestShellTest { class RequestContext : public TestURLRequestContext { public: RequestContext() { - cookie_store_.reset(new net::CookieMonster()); + cookie_store_ = new net::CookieMonster(); + } + + virtual ~RequestContext() { + delete cookie_store_; } }; diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index 6c09cfd..8f8202d 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -23,7 +23,7 @@ void TestShellRequestContext::Init( const std::wstring& cache_path, net::HttpCache::Mode cache_mode, bool no_proxy) { - cookie_store_.reset(new net::CookieMonster()); + cookie_store_ = new net::CookieMonster(); user_agent_ = webkit_glue::GetUserAgent(); @@ -42,9 +42,12 @@ void TestShellRequestContext::Init( cache = new net::HttpCache(proxy_service_, cache_path, 0); } cache->set_mode(cache_mode); - http_transaction_factory_.reset(cache); + http_transaction_factory_ = cache; } TestShellRequestContext::~TestShellRequestContext() { + delete cookie_store_; + delete http_transaction_factory_; + delete proxy_service_; } -- cgit v1.1