Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3370)

Unified Diff: chrome/browser/custom_handlers/protocol_handler_registry.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/custom_handlers/protocol_handler_registry.cc
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc
index c303a38c7e10f9c57883cf338e76f14b44d98afa..de1e8714b8f467d27f362024647ed7acb64053a7 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()));
}
« no previous file with comments | « chrome/browser/content_settings/local_shared_objects_container.h ('k') | chrome/browser/devtools/adb_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698