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

3 files changed, 11 insertions, 5 deletions

diff --git a/webkit/glue/plugins/mozilla_extensions.cc b/webkit/glue/plugins/mozilla_extensions.cc
index b70e87b..5c0f47f 100644
--- a/webkit/glue/plugins/mozilla_extensions.cc
+++ b/webkit/glue/plugins/mozilla_extensions.cc
@@ -42,8 +42,7 @@ bool MozillaExtensionApi::FindProxyForUrl(const char* url,
     return result;
   }
 
-  scoped_refptr<net::ProxyService> proxy_service(
-      net::ProxyService::Create(NULL));
+  scoped_ptr<net::ProxyService> proxy_service(net::ProxyService::Create(NULL));
   if (!proxy_service.get()) {
     NOTREACHED();
     return result;
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_;
 }