diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc index 4a496ef3f9dc..87cc591736f6 100644 --- a/atom/browser/api/atom_api_app.cc +++ b/atom/browser/api/atom_api_app.cc @@ -659,7 +659,7 @@ void App::OnLogin(LoginHandler* login_handler, request_details, login_handler->auth_info(), base::Bind(&PassLoginInformation, - make_scoped_refptr(login_handler))); + WrapRefCounted(login_handler))); } // Default behavior is to always cancel the auth. diff --git a/atom/browser/api/atom_api_cookies.cc b/atom/browser/api/atom_api_cookies.cc index b0ecbea4fef1..c83c10a14623 100644 --- a/atom/browser/api/atom_api_cookies.cc +++ b/atom/browser/api/atom_api_cookies.cc @@ -250,7 +250,7 @@ Cookies::~Cookies() {} void Cookies::Get(const base::DictionaryValue& filter, const GetCallback& callback) { std::unique_ptr copied(filter.CreateDeepCopy()); - auto getter = make_scoped_refptr(request_context_getter_); + auto getter = WrapRefCounted(request_context_getter_); content::BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(GetCookiesOnIO, getter, Passed(&copied), callback)); @@ -258,7 +258,7 @@ void Cookies::Get(const base::DictionaryValue& filter, void Cookies::Remove(const GURL& url, const std::string& name, const base::Closure& callback) { - auto getter = make_scoped_refptr(request_context_getter_); + auto getter = WrapRefCounted(request_context_getter_); content::BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(RemoveCookieOnIOThread, getter, url, name, callback)); @@ -267,14 +267,14 @@ void Cookies::Remove(const GURL& url, const std::string& name, void Cookies::Set(const base::DictionaryValue& details, const SetCallback& callback) { std::unique_ptr copied(details.CreateDeepCopy()); - auto getter = make_scoped_refptr(request_context_getter_); + auto getter = WrapRefCounted(request_context_getter_); content::BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(SetCookieOnIO, getter, Passed(&copied), callback)); } void Cookies::FlushStore(const base::Closure& callback) { - auto getter = make_scoped_refptr(request_context_getter_); + auto getter = WrapRefCounted(request_context_getter_); content::BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(FlushCookieStoreOnIOThread, getter, callback)); diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc index 86d4e4bb227b..b7b6b2abca60 100644 --- a/atom/browser/api/atom_api_session.cc +++ b/atom/browser/api/atom_api_session.cc @@ -498,7 +498,7 @@ template void Session::DoCacheAction(const net::CompletionCallback& callback) { BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&DoCacheActionInIO, - make_scoped_refptr(browser_context_->GetRequestContext()), + WrapRefCounted(browser_context_->GetRequestContext()), action, callback)); } @@ -591,7 +591,7 @@ void Session::SetCertVerifyProc(v8::Local val, BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&SetCertVerifyProcInIO, - make_scoped_refptr(browser_context_->GetRequestContext()), + WrapRefCounted(browser_context_->GetRequestContext()), proc)); } @@ -613,7 +613,7 @@ void Session::ClearHostResolverCache(mate::Arguments* args) { BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&ClearHostResolverCacheInIO, - make_scoped_refptr(browser_context_->GetRequestContext()), + WrapRefCounted(browser_context_->GetRequestContext()), callback)); } @@ -629,14 +629,14 @@ void Session::ClearAuthCache(mate::Arguments* args) { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(&ClearAuthCacheInIO, - make_scoped_refptr(browser_context_->GetRequestContext()), + WrapRefCounted(browser_context_->GetRequestContext()), options, callback)); } void Session::AllowNTLMCredentialsForDomains(const std::string& domains) { BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&AllowNTLMCredentialsForDomainsInIO, - make_scoped_refptr(browser_context_->GetRequestContext()), + WrapRefCounted(browser_context_->GetRequestContext()), domains)); } diff --git a/atom/browser/login_handler.cc b/atom/browser/login_handler.cc index 827154b0d0b4..8eef00756dec 100644 --- a/atom/browser/login_handler.cc +++ b/atom/browser/login_handler.cc @@ -49,7 +49,7 @@ LoginHandler::LoginHandler(net::AuthChallengeInfo* auth_info, BrowserThread::UI, FROM_HERE, base::Bind(&Browser::RequestLogin, base::Unretained(Browser::Get()), - base::RetainedRef(make_scoped_refptr(this)), + base::RetainedRef(WrapRefCounted(this)), base::Passed(&request_details))); } diff --git a/atom/browser/net/asar/url_request_asar_job.cc b/atom/browser/net/asar/url_request_asar_job.cc index a6fe5e26540c..ebbc65ec8d85 100644 --- a/atom/browser/net/asar/url_request_asar_job.cc +++ b/atom/browser/net/asar/url_request_asar_job.cc @@ -144,7 +144,7 @@ int URLRequestAsarJob::ReadRawData(net::IOBuffer* dest, int dest_size) { dest_size, base::Bind(&URLRequestAsarJob::DidRead, weak_ptr_factory_.GetWeakPtr(), - make_scoped_refptr(dest))); + WrapRefCounted(dest))); if (rv >= 0) { remaining_bytes_ -= rv; DCHECK_GE(remaining_bytes_, 0); diff --git a/atom/browser/net/atom_url_request.cc b/atom/browser/net/atom_url_request.cc index 1f0bdae4c08a..b524bf76971e 100644 --- a/atom/browser/net/atom_url_request.cc +++ b/atom/browser/net/atom_url_request.cc @@ -444,7 +444,7 @@ bool AtomURLRequest::CopyAndPostBuffer(int bytes_read) { // data is only a wrapper for the asynchronous response_read_buffer_. // Make a deep copy of payload and transfer ownership to the UI thread. - auto buffer_copy = make_scoped_refptr(new net::IOBufferWithSize(bytes_read)); + auto buffer_copy = WrapRefCounted(new net::IOBufferWithSize(bytes_read)); memcpy(buffer_copy->data(), response_read_buffer_->data(), bytes_read); return content::BrowserThread::PostTask( diff --git a/atom/browser/net/url_request_stream_job.cc b/atom/browser/net/url_request_stream_job.cc index 99e4e74cd776..9fdc4507b905 100644 --- a/atom/browser/net/url_request_stream_job.cc +++ b/atom/browser/net/url_request_stream_job.cc @@ -119,7 +119,7 @@ int URLRequestStreamJob::ReadRawData(net::IOBuffer* dest, int dest_size) { content::BrowserThread::PostTask( content::BrowserThread::UI, FROM_HERE, base::Bind(&URLRequestStreamJob::CopyMoreData, weak_factory_.GetWeakPtr(), - make_scoped_refptr(dest), dest_size)); + WrapRefCounted(dest), dest_size)); return net::ERR_IO_PENDING; } diff --git a/brightray/browser/browser_context.cc b/brightray/browser/browser_context.cc index 43dc5142ed26..79aebcb139f2 100644 --- a/brightray/browser/browser_context.cc +++ b/brightray/browser/browser_context.cc @@ -65,7 +65,7 @@ scoped_refptr BrowserContext::Get( const std::string& partition, bool in_memory) { PartitionKey key(partition, in_memory); if (browser_context_map_[key].get()) - return make_scoped_refptr(browser_context_map_[key].get()); + return WrapRefCounted(browser_context_map_[key].get()); return nullptr; } @@ -108,7 +108,7 @@ void BrowserContext::InitPrefs() { pref_store->ReadPrefs(); // Synchronous. prefs_factory.set_user_prefs(pref_store); - auto registry = make_scoped_refptr(new PrefRegistrySimple); + auto registry = WrapRefCounted(new PrefRegistrySimple); RegisterInternalPrefs(registry.get()); RegisterPrefs(registry.get()); diff --git a/chromium_src/chrome/browser/printing/print_job.cc b/chromium_src/chrome/browser/printing/print_job.cc index ccc6ac9bed15..1c07453c7d95 100644 --- a/chromium_src/chrome/browser/printing/print_job.cc +++ b/chromium_src/chrome/browser/printing/print_job.cc @@ -126,7 +126,7 @@ void PrintJob::StartPrinting() { // Real work is done in PrintJobWorker::StartPrinting(). worker_->PostTask(FROM_HERE, - base::Bind(&HoldRefCallback, make_scoped_refptr(this), + base::Bind(&HoldRefCallback, WrapRefCounted(this), base::Bind(&PrintJobWorker::StartPrinting, base::Unretained(worker_.get()), base::RetainedRef(document_)))); @@ -349,7 +349,7 @@ void PrintJob::UpdatePrintedDocument(PrintedDocument* new_document) { DCHECK(!is_job_pending_); // Sync the document with the worker. worker_->PostTask(FROM_HERE, - base::Bind(&HoldRefCallback, make_scoped_refptr(this), + base::Bind(&HoldRefCallback, WrapRefCounted(this), base::Bind(&PrintJobWorker::OnDocumentChanged, base::Unretained(worker_.get()), base::RetainedRef(document_)))); diff --git a/chromium_src/chrome/browser/printing/print_job_manager.cc b/chromium_src/chrome/browser/printing/print_job_manager.cc index 96d10d2a9fa4..aa999e1d3cda 100644 --- a/chromium_src/chrome/browser/printing/print_job_manager.cc +++ b/chromium_src/chrome/browser/printing/print_job_manager.cc @@ -25,7 +25,7 @@ PrintQueriesQueue::~PrintQueriesQueue() { void PrintQueriesQueue::QueuePrinterQuery(PrinterQuery* job) { base::AutoLock lock(lock_); DCHECK(job); - queued_queries_.push_back(make_scoped_refptr(job)); + queued_queries_.push_back(WrapRefCounted(job)); DCHECK(job->is_valid()); } @@ -47,7 +47,7 @@ scoped_refptr PrintQueriesQueue::PopPrinterQuery( scoped_refptr PrintQueriesQueue::CreatePrinterQuery( int render_process_id, int render_frame_id) { - return make_scoped_refptr( + return WrapRefCounted( new PrinterQuery(render_process_id, render_frame_id)); } diff --git a/chromium_src/chrome/browser/printing/print_job_worker.cc b/chromium_src/chrome/browser/printing/print_job_worker.cc index 419f93f38233..5d13994134b0 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker.cc +++ b/chromium_src/chrome/browser/printing/print_job_worker.cc @@ -242,7 +242,7 @@ void PrintJobWorker::GetSettings(bool ask_user_for_settings, if (ask_user_for_settings) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - base::Bind(&HoldRefCallback, make_scoped_refptr(owner_), + base::Bind(&HoldRefCallback, WrapRefCounted(owner_), base::Bind(&PrintJobWorker::GetSettingsWithUI, base::Unretained(this), document_page_count, @@ -251,14 +251,14 @@ void PrintJobWorker::GetSettings(bool ask_user_for_settings, } else if (!device_name.empty()) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - base::Bind(&HoldRefCallback, make_scoped_refptr(owner_), + base::Bind(&HoldRefCallback, WrapRefCounted(owner_), base::Bind(&PrintJobWorker::InitWithDeviceName, base::Unretained(this), device_name))); } else { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - base::Bind(&HoldRefCallback, make_scoped_refptr(owner_), + base::Bind(&HoldRefCallback, WrapRefCounted(owner_), base::Bind(&PrintJobWorker::UseDefaultSettings, base::Unretained(this)))); } @@ -272,7 +272,7 @@ void PrintJobWorker::SetSettings( BrowserThread::UI, FROM_HERE, base::Bind(&HoldRefCallback, - make_scoped_refptr(owner_), + WrapRefCounted(owner_), base::Bind(&PrintJobWorker::UpdatePrintSettings, base::Unretained(this), base::Passed(&new_settings)))); @@ -299,7 +299,7 @@ void PrintJobWorker::GetSettingsDone(PrintingContext::Result result) { // PrintJob will create the new PrintedDocument. owner_->PostTask(FROM_HERE, base::Bind(&PrintJobWorkerOwner::GetSettingsDone, - make_scoped_refptr(owner_), + WrapRefCounted(owner_), printing_context_->settings(), result)); } @@ -313,7 +313,7 @@ void PrintJobWorker::GetSettingsWithUI( // weak_factory_ creates pointers valid only on owner_ thread. printing_context_->AskUserForSettings( document_page_count, has_selection, is_scripted, - base::Bind(&PostOnOwnerThread, make_scoped_refptr(owner_), + base::Bind(&PostOnOwnerThread, WrapRefCounted(owner_), base::Bind(&PrintJobWorker::GetSettingsDone, weak_factory_.GetWeakPtr()))); }