diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:15:09 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:15:09 +0000 |
commit | dc24976fc87171d50b49f37bbaaa23ae53e51f4b (patch) | |
tree | 8d7c684afa0d65e22efc3384197ef5b50d867160 /chrome/browser/custom_handlers/protocol_handler_registry.cc | |
parent | fc72bb18b111ff63e57135d97de6d59291f3b7b8 (diff) | |
download | chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.zip chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.gz chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.bz2 |
Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes, Part 2 of N
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16295003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/custom_handlers/protocol_handler_registry.cc')
-rw-r--r-- | chrome/browser/custom_handlers/protocol_handler_registry.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc index c303a38..de1e871 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -163,7 +163,7 @@ net::URLRequestJob* ProtocolHandlerRegistry::IOThreadDelegate::MaybeCreateJob( ProtocolHandlerRegistry::JobInterceptorFactory::JobInterceptorFactory( IOThreadDelegate* io_thread_delegate) : io_thread_delegate_(io_thread_delegate) { - DCHECK(io_thread_delegate_); + DCHECK(io_thread_delegate_.get()); DetachFromThread(); } @@ -301,7 +301,7 @@ void ProtocolHandlerRegistry::Delegate::RegisterWithOSAsDefaultClient( // and it will be automatically freed once all its tasks have finished. scoped_refptr<ShellIntegration::DefaultProtocolClientWorker> worker; worker = CreateShellWorker(observer, protocol); - observer->SetWorker(worker); + observer->SetWorker(worker.get()); registry->default_client_observers_.push_back(observer); worker->StartSetAsDefault(); } @@ -474,7 +474,7 @@ void ProtocolHandlerRegistry::InitProtocolSettings() { DefaultClientObserver* observer = delegate_->CreateShellObserver(this); scoped_refptr<ShellIntegration::DefaultProtocolClientWorker> worker; worker = delegate_->CreateShellWorker(observer, handler.protocol()); - observer->SetWorker(worker); + observer->SetWorker(worker.get()); default_client_observers_.push_back(observer); worker->StartCheckIsDefault(); } @@ -882,6 +882,6 @@ ProtocolHandlerRegistry::CreateJobInterceptorFactory() { // this is always created on the UI thread (in profile_io's // InitializeOnUIThread. Any method calls must be done // on the IO thread (this is checked). - return scoped_ptr<JobInterceptorFactory>(new JobInterceptorFactory( - io_thread_delegate_)); + return scoped_ptr<JobInterceptorFactory>( + new JobInterceptorFactory(io_thread_delegate_.get())); } |