diff options
16 files changed, 63 insertions, 69 deletions
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.cc b/android_webview/browser/net/android_stream_reader_url_request_job.cc index 091c237..97ad3a8 100644 --- a/android_webview/browser/net/android_stream_reader_url_request_job.cc +++ b/android_webview/browser/net/android_stream_reader_url_request_job.cc @@ -230,7 +230,7 @@ int AndroidStreamReaderURLRequestJob::ReadRawData(net::IOBuffer* dest, PostTaskAndReplyWithResult( GetWorkerThreadRunner(), FROM_HERE, base::Bind(&InputStreamReaderWrapper::ReadRawData, - input_stream_reader_wrapper_, make_scoped_refptr(dest), + input_stream_reader_wrapper_, base::RetainedRef(dest), dest_size), base::Bind(&AndroidStreamReaderURLRequestJob::OnReaderReadCompleted, weak_factory_.GetWeakPtr())); diff --git a/android_webview/browser/net/aw_cookie_store_wrapper.h b/android_webview/browser/net/aw_cookie_store_wrapper.h index a5bbf1a..e3f3a5d 100644 --- a/android_webview/browser/net/aw_cookie_store_wrapper.h +++ b/android_webview/browser/net/aw_cookie_store_wrapper.h @@ -111,8 +111,8 @@ class AwCookieStoreWrapper : public net::CookieStore { if (callback.is_null()) return callback; return base::Bind(&AwCookieStoreWrapper::RunCallbackOnClientThread<Type>, - client_task_runner_, weak_factory_.GetWeakPtr(), - callback); + base::RetainedRef(client_task_runner_), + weak_factory_.GetWeakPtr(), callback); } // Returns a base::Closure that posts a task to the |client_task_runner_| to diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc index d5b3b44..8cd4cc9 100644 --- a/android_webview/native/aw_contents_client_bridge.cc +++ b/android_webview/native/aw_contents_client_bridge.cc @@ -263,7 +263,7 @@ void AwContentsClientBridge::ProvideClientCertificateResponse( base::Bind(&RecordClientCertificateKey, client_cert, base::Passed(&private_key)), base::Bind(&content::ClientCertificateDelegate::ContinueWithCertificate, - base::Owned(delegate), client_cert)); + base::Owned(delegate), base::RetainedRef(client_cert))); } void AwContentsClientBridge::RunJavaScriptDialog( diff --git a/chrome/browser/android/cookies/cookies_fetcher.cc b/chrome/browser/android/cookies/cookies_fetcher.cc index 4a1455d..947129f 100644 --- a/chrome/browser/android/cookies/cookies_fetcher.cc +++ b/chrome/browser/android/cookies/cookies_fetcher.cc @@ -44,9 +44,10 @@ void CookiesFetcher::PersistCookies(JNIEnv* env, jobject_.Reset(env, obj); // The rest must be done from the IO thread. - content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE, + content::BrowserThread::PostTask( + content::BrowserThread::IO, FROM_HERE, base::Bind(&CookiesFetcher::PersistCookiesInternal, - base::Unretained(this), getter)); + base::Unretained(this), base::RetainedRef(getter))); } void CookiesFetcher::PersistCookiesInternal( @@ -132,12 +133,9 @@ void CookiesFetcher::RestoreCookies(JNIEnv* env, // The rest must be done from the IO thread. content::BrowserThread::PostTask( - content::BrowserThread::IO, - FROM_HERE, + content::BrowserThread::IO, FROM_HERE, base::Bind(&CookiesFetcher::RestoreToCookieJarInternal, - base::Unretained(this), - getter, - cookie)); + base::Unretained(this), base::RetainedRef(getter), cookie)); } void CookiesFetcher::RestoreToCookieJarInternal( diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc index a4bf4ad..6953256 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc @@ -85,7 +85,7 @@ int WebkitFileStreamWriterImpl::Write(net::IOBuffer* buf, file_system_getter_, file_path_, base::Bind( &WebkitFileStreamWriterImpl::WriteAfterCreateWritableSnapshotFile, - weak_ptr_factory_.GetWeakPtr(), make_scoped_refptr(buf), buf_len)); + weak_ptr_factory_.GetWeakPtr(), base::RetainedRef(buf), buf_len)); return net::ERR_IO_PENDING; } diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc index 58e0c30..7a5cd78 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc @@ -205,7 +205,8 @@ void WallpaperSetWallpaperFunction::GenerateThumbnail( BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::Bind(&WallpaperSetWallpaperFunction::ThumbnailGenerated, this, - original_data, thumbnail_data)); + base::RetainedRef(original_data), + base::RetainedRef(thumbnail_data))); } void WallpaperSetWallpaperFunction::ThumbnailGenerated( diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc index a51750f..ce46325 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc @@ -670,10 +670,10 @@ void WallpaperPrivateSetCustomWallpaperFunction::GenerateThumbnail( wallpaper::kWallpaperThumbnailWidth, wallpaper::kWallpaperThumbnailHeight, &data, NULL); BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, - base::Bind( - &WallpaperPrivateSetCustomWallpaperFunction::ThumbnailGenerated, - this, data)); + BrowserThread::UI, FROM_HERE, + base::Bind( + &WallpaperPrivateSetCustomWallpaperFunction::ThumbnailGenerated, this, + base::RetainedRef(data))); } void WallpaperPrivateSetCustomWallpaperFunction::ThumbnailGenerated( diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index d207e5b..77d4939 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -304,8 +304,8 @@ void ExistingUserController::Observe( content::BrowserThread::PostDelayedTask( content::BrowserThread::IO, FROM_HERE, base::Bind(&TransferContextAuthenticationsOnIOThread, - signin_profile_context_getter, - browser_process_context_getter), + base::RetainedRef(signin_profile_context_getter), + base::RetainedRef(browser_process_context_getter)), base::TimeDelta::FromMilliseconds(kAuthCacheTransferDelayMs)); } } diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index a54409f..35c5e93 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -575,7 +575,7 @@ void JumpList::DeferredRunUpdate() { incognito_availability, app_id_, icon_dir_, - jumplist_data_)); + base::RetainedRef(jumplist_data_))); } void JumpList::TopSitesLoaded(history::TopSites* top_sites) { diff --git a/chrome/browser/ui/android/ssl_client_certificate_request.cc b/chrome/browser/ui/android/ssl_client_certificate_request.cc index 1f11945..d9fd7a3 100644 --- a/chrome/browser/ui/android/ssl_client_certificate_request.cc +++ b/chrome/browser/ui/android/ssl_client_certificate_request.cc @@ -175,7 +175,8 @@ static void OnSystemRequestCompletion( base::Bind(&RecordClientCertificateKey, client_cert, base::Passed(&private_key)), base::Bind(&content::ClientCertificateDelegate::ContinueWithCertificate, - base::Owned(delegate.release()), client_cert)); + base::Owned(delegate.release()), + base::RetainedRef(client_cert))); } static void NotifyClientCertificatesChanged() { diff --git a/ios/chrome/browser/safe_browsing/safe_browsing_service.cc b/ios/chrome/browser/safe_browsing/safe_browsing_service.cc index 3724492..e2bbe92 100644 --- a/ios/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/ios/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -342,9 +342,10 @@ void SafeBrowsingService::StopOnIOThread(bool shutdown) { void SafeBrowsingService::Start() { DCHECK_CURRENTLY_ON(web::WebThread::UI); - web::WebThread::PostTask(web::WebThread::IO, FROM_HERE, - base::Bind(&SafeBrowsingService::StartOnIOThread, - this, url_request_context_getter_)); + web::WebThread::PostTask( + web::WebThread::IO, FROM_HERE, + base::Bind(&SafeBrowsingService::StartOnIOThread, this, + base::RetainedRef(url_request_context_getter_))); } void SafeBrowsingService::Stop(bool shutdown) { diff --git a/ios/chrome/browser/web_resource/web_resource_util.cc b/ios/chrome/browser/web_resource/web_resource_util.cc index e11dedb..cceb553 100644 --- a/ios/chrome/browser/web_resource/web_resource_util.cc +++ b/ios/chrome/browser/web_resource/web_resource_util.cc @@ -65,9 +65,10 @@ void StartParseJSONAsync( const WebResourceService::SuccessCallback& success_callback, const WebResourceService::ErrorCallback& error_callback) { web::WebThread::PostBlockingPoolTask( - FROM_HERE, base::Bind(&ParseJSONOnBackgroundThread, - base::ThreadTaskRunnerHandle::Get(), data, - success_callback, error_callback)); + FROM_HERE, + base::Bind(&ParseJSONOnBackgroundThread, + base::RetainedRef(base::ThreadTaskRunnerHandle::Get()), data, + success_callback, error_callback)); } } // namespace diff --git a/ios/web/net/request_tracker_impl.mm b/ios/web/net/request_tracker_impl.mm index 4fc43227..b33c0f6 100644 --- a/ios/web/net/request_tracker_impl.mm +++ b/ios/web/net/request_tracker_impl.mm @@ -517,8 +517,8 @@ void RequestTrackerImpl::CaptureHeaders(net::URLRequest* request) { scoped_refptr<net::HttpResponseHeaders> headers(request->response_headers()); web::WebThread::PostTask( web::WebThread::UI, FROM_HERE, - base::Bind(&RequestTrackerImpl::NotifyResponseHeaders, this, headers, - request->url())); + base::Bind(&RequestTrackerImpl::NotifyResponseHeaders, this, + base::RetainedRef(headers), request->url())); } void RequestTrackerImpl::CaptureExpectedLength(const net::URLRequest* request, @@ -626,7 +626,8 @@ void RequestTrackerImpl::CaptureCertificatePolicyCache( web::WebThread::PostTask( web::WebThread::UI, FROM_HERE, base::Bind(&RequestTrackerImpl::NotifyCertificateUsed, this, - ssl_info.cert, host, ssl_info.cert_status)); + base::RetainedRef(ssl_info.cert), host, + ssl_info.cert_status)); } should_continue.Run(true); } @@ -1149,7 +1150,7 @@ void RequestTrackerImpl::RecomputeCertificatePolicy( web::WebThread::PostTask( web::WebThread::UI, FROM_HERE, base::Bind(&RequestTrackerImpl::NotifyCertificateUsed, this, - counts->ssl_info.cert, host, + base::RetainedRef(counts->ssl_info.cert), host, counts->ssl_info.cert_status)); } if (counts == splitPosition) diff --git a/ios/web/webui/url_data_manager_ios_backend.mm b/ios/web/webui/url_data_manager_ios_backend.mm index 29c2e3f..ce3e279 100644 --- a/ios/web/webui/url_data_manager_ios_backend.mm +++ b/ios/web/webui/url_data_manager_ios_backend.mm @@ -461,9 +461,8 @@ bool URLDataManagerIOSBackend::StartRequest(const net::URLRequest* request, base::MessageLoop* target_message_loop = web::WebThread::UnsafeGetMessageLoopForThread(web::WebThread::UI); target_message_loop->PostTask( - FROM_HERE, - base::Bind(&GetMimeTypeOnUI, scoped_refptr<URLDataSourceIOSImpl>(source), - path, job->weak_factory_.GetWeakPtr())); + FROM_HERE, base::Bind(&GetMimeTypeOnUI, base::RetainedRef(source), path, + job->weak_factory_.GetWeakPtr())); target_message_loop->PostTask( FROM_HERE, base::Bind(&URLDataManagerIOSBackend::CallStartRequest, diff --git a/net/cert/cert_database_android.cc b/net/cert/cert_database_android.cc index d9b0dfc..89a1a44 100644 --- a/net/cert/cert_database_android.cc +++ b/net/cert/cert_database_android.cc @@ -48,8 +48,7 @@ void CertDatabase::OnAndroidKeyStoreChanged() { } void CertDatabase::OnAndroidKeyChainChanged() { - observer_list_->Notify(FROM_HERE, &Observer::OnCACertChanged, - scoped_refptr<X509Certificate>()); + observer_list_->Notify(FROM_HERE, &Observer::OnCACertChanged, nullptr); } } // namespace net diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 027b46e..e3d0a36 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -969,9 +969,8 @@ int SSLClientSocketNSS::Core::Read(IOBuffer* buf, int buf_len, nss_waiting_read_ = true; bool posted = nss_task_runner_->PostTask( - FROM_HERE, - base::Bind(IgnoreResult(&Core::Read), this, make_scoped_refptr(buf), - buf_len, callback)); + FROM_HERE, base::Bind(IgnoreResult(&Core::Read), this, + base::RetainedRef(buf), buf_len, callback)); if (!posted) { nss_is_closed_ = true; nss_waiting_read_ = false; @@ -1026,9 +1025,8 @@ int SSLClientSocketNSS::Core::Write(IOBuffer* buf, int buf_len, nss_waiting_write_ = true; bool posted = nss_task_runner_->PostTask( - FROM_HERE, - base::Bind(IgnoreResult(&Core::Write), this, make_scoped_refptr(buf), - buf_len, callback)); + FROM_HERE, base::Bind(IgnoreResult(&Core::Write), this, + base::RetainedRef(buf), buf_len, callback)); if (!posted) { nss_is_closed_ = true; nss_waiting_write_ = false; @@ -1536,11 +1534,10 @@ int SSLClientSocketNSS::Core::DoPayloadRead() { pending_read_nss_error_ = 0; if (rv == 0) { - PostOrRunCallback( - FROM_HERE, - base::Bind(&LogByteTransferEvent, weak_net_log_, - NetLog::TYPE_SSL_SOCKET_BYTES_RECEIVED, rv, - scoped_refptr<IOBuffer>(user_read_buf_))); + PostOrRunCallback(FROM_HERE, + base::Bind(&LogByteTransferEvent, weak_net_log_, + NetLog::TYPE_SSL_SOCKET_BYTES_RECEIVED, rv, + base::RetainedRef(user_read_buf_))); } else { PostOrRunCallback( FROM_HERE, @@ -1621,11 +1618,10 @@ int SSLClientSocketNSS::Core::DoPayloadRead() { DCHECK_NE(ERR_IO_PENDING, pending_read_result_); if (rv >= 0) { - PostOrRunCallback( - FROM_HERE, - base::Bind(&LogByteTransferEvent, weak_net_log_, - NetLog::TYPE_SSL_SOCKET_BYTES_RECEIVED, rv, - scoped_refptr<IOBuffer>(user_read_buf_))); + PostOrRunCallback(FROM_HERE, + base::Bind(&LogByteTransferEvent, weak_net_log_, + NetLog::TYPE_SSL_SOCKET_BYTES_RECEIVED, rv, + base::RetainedRef(user_read_buf_))); } else if (rv != ERR_IO_PENDING) { PostOrRunCallback( FROM_HERE, @@ -1654,11 +1650,10 @@ int SSLClientSocketNSS::Core::DoPayloadWrite() { base::Bind(&Core::OnNSSBufferUpdated, this, new_amount_in_read_buffer)); } if (rv >= 0) { - PostOrRunCallback( - FROM_HERE, - base::Bind(&LogByteTransferEvent, weak_net_log_, - NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv, - scoped_refptr<IOBuffer>(user_write_buf_))); + PostOrRunCallback(FROM_HERE, + base::Bind(&LogByteTransferEvent, weak_net_log_, + NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv, + base::RetainedRef(user_write_buf_))); return rv; } PRErrorCode prerr = PR_GetError(); @@ -1725,9 +1720,8 @@ int SSLClientSocketNSS::Core::BufferRecv() { rv = DoBufferRecv(read_buffer.get(), nb); } else { bool posted = network_task_runner_->PostTask( - FROM_HERE, - base::Bind(IgnoreResult(&Core::DoBufferRecv), this, read_buffer, - nb)); + FROM_HERE, base::Bind(IgnoreResult(&Core::DoBufferRecv), this, + base::RetainedRef(read_buffer), nb)); rv = posted ? ERR_IO_PENDING : ERR_ABORTED; } @@ -1775,9 +1769,8 @@ int SSLClientSocketNSS::Core::BufferSend() { rv = DoBufferSend(send_buffer.get(), len); } else { bool posted = network_task_runner_->PostTask( - FROM_HERE, - base::Bind(IgnoreResult(&Core::DoBufferSend), this, send_buffer, - len)); + FROM_HERE, base::Bind(IgnoreResult(&Core::DoBufferSend), this, + base::RetainedRef(send_buffer), len)); rv = posted ? ERR_IO_PENDING : ERR_ABORTED; } @@ -1983,7 +1976,7 @@ void SSLClientSocketNSS::Core::UpdateServerCert() { // own a reference to the certificate. NetLog::ParametersCallback net_log_callback = base::Bind(&NetLogX509CertificateCallback, - nss_handshake_state_.server_cert); + base::RetainedRef(nss_handshake_state_.server_cert)); PostOrRunCallback( FROM_HERE, base::Bind(&AddLogEventWithCallback, weak_net_log_, @@ -2164,12 +2157,12 @@ int SSLClientSocketNSS::Core::DoBufferRecv(IOBuffer* read_buffer, int len) { int rv = transport_->socket()->Read( read_buffer, len, base::Bind(&Core::BufferRecvComplete, base::Unretained(this), - scoped_refptr<IOBuffer>(read_buffer))); + base::RetainedRef(read_buffer))); if (!OnNSSTaskRunner() && rv != ERR_IO_PENDING) { - nss_task_runner_->PostTask( - FROM_HERE, base::Bind(&Core::BufferRecvComplete, this, - scoped_refptr<IOBuffer>(read_buffer), rv)); + nss_task_runner_->PostTask(FROM_HERE, + base::Bind(&Core::BufferRecvComplete, this, + base::RetainedRef(read_buffer), rv)); return rv; } @@ -2306,7 +2299,7 @@ void SSLClientSocketNSS::Core::BufferRecvComplete( nss_task_runner_->PostTask( FROM_HERE, base::Bind(&Core::BufferRecvComplete, this, - scoped_refptr<IOBuffer>(read_buffer), result)); + base::RetainedRef(read_buffer), result)); return; } |