diff options
| author | smckay@chromium.org <smckay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 20:15:19 +0000 |
|---|---|---|
| committer | smckay@chromium.org <smckay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 20:15:19 +0000 |
| commit | b2deb2f66b17f7e7ae036287d2773b9e82593089 (patch) | |
| tree | 98199c1bc3e69087d81688c0b7d0d609961aaf94 /chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc | |
| parent | 6bb352a2789640b0738f072355b08f8968022db2 (diff) | |
| download | chromium_src-b2deb2f66b17f7e7ae036287d2773b9e82593089.zip chromium_src-b2deb2f66b17f7e7ae036287d2773b9e82593089.tar.gz chromium_src-b2deb2f66b17f7e7ae036287d2773b9e82593089.tar.bz2 | |
Cleanup URLInterceptors in test methods.
BUG=138518,138520
TEST=ProtocolHandlerRegistryTest
Review URL: https://chromiumcodereview.appspot.com/10796091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc')
| -rw-r--r-- | chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc index 26512b5..784e134 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc @@ -747,10 +747,10 @@ TEST_F(ProtocolHandlerRegistryTest, TestMaybeCreateTaskWorksFromIOThread) { ProtocolHandler ph1 = CreateProtocolHandler("mailto", "test1"); registry()->OnAcceptRegisterProtocolHandler(ph1); GURL url("mailto:someone@something.com"); - net::URLRequestJobFactory::Interceptor* interceptor = - registry()->CreateURLInterceptor(); - AssertIntercepted(url, interceptor); + scoped_ptr<net::URLRequestJobFactory::Interceptor> interceptor( + registry()->CreateURLInterceptor()); + AssertIntercepted(url, interceptor.get()); } TEST_F(ProtocolHandlerRegistryTest, @@ -758,10 +758,10 @@ TEST_F(ProtocolHandlerRegistryTest, std::string scheme("mailto"); ProtocolHandler ph1 = CreateProtocolHandler(scheme, "test1"); registry()->OnAcceptRegisterProtocolHandler(ph1); - net::URLRequestJobFactory::Interceptor* interceptor = - registry()->CreateURLInterceptor(); - AssertWillHandle(scheme, true, interceptor); + scoped_ptr<net::URLRequestJobFactory::Interceptor> interceptor( + registry()->CreateURLInterceptor()); + AssertWillHandle(scheme, true, interceptor.get()); } TEST_F(ProtocolHandlerRegistryTest, TestRemovingDefaultFallsBackToOldDefault) { @@ -805,10 +805,10 @@ TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestClearDefaultGetsPropagatedToIO) { ProtocolHandler ph1 = CreateProtocolHandler(scheme, "test1"); registry()->OnAcceptRegisterProtocolHandler(ph1); registry()->ClearDefault(scheme); - net::URLRequestJobFactory::Interceptor* interceptor = - registry()->CreateURLInterceptor(); - AssertWillHandle(scheme, false, interceptor); + scoped_ptr<net::URLRequestJobFactory::Interceptor> interceptor( + registry()->CreateURLInterceptor()); + AssertWillHandle(scheme, false, interceptor.get()); } TEST_F(ProtocolHandlerRegistryTest, TestLoadEnabledGetsPropogatedToIO) { @@ -816,12 +816,11 @@ TEST_F(ProtocolHandlerRegistryTest, TestLoadEnabledGetsPropogatedToIO) { ProtocolHandler ph1 = CreateProtocolHandler(mailto, "MailtoHandler"); registry()->OnAcceptRegisterProtocolHandler(ph1); - net::URLRequestJobFactory::Interceptor* interceptor = - registry()->CreateURLInterceptor(); - AssertWillHandle(mailto, true, interceptor); + scoped_ptr<net::URLRequestJobFactory::Interceptor> interceptor( + registry()->CreateURLInterceptor()); + AssertWillHandle(mailto, true, interceptor.get()); registry()->Disable(); - AssertWillHandle(mailto, false, interceptor); - delete interceptor; + AssertWillHandle(mailto, false, interceptor.get()); } TEST_F(ProtocolHandlerRegistryTest, TestReplaceHandler) { |