base: Change make_scoped_refptr to WrapRefCounted.

The helper function make_scoped_refptr() doesn't match the base/std naming convention for make to construct the object. Now there is MakeRefCounted() to make a new scoped_refptr and WrapRefCounted() to wrap something in scoped_refptr, similar to MakeUnique() and WrapUnique(). This is a purely mechanical regex search and replace. Bug: 765333 Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Change-Id: I5057e51282e519693f6fca504bd54deb638b712f Reviewed-on: https://chromium-review.googlesource.com/667726 Commit-Queue: kylechar <kylechar@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: danakj <danakj@chromium.org> Cr-Commit-Position: refs/heads/master@{#506316}
Denger-Network · Oct 4, 2017 · da69d88 · da69d88
1 parent a2b4bf9
commit da69d88
Show file tree

Hide file tree

Showing 172 changed files with 376 additions and 399 deletions.
diff --git a/android_webview/browser/surfaces_instance.cc b/android_webview/browser/surfaces_instance.cc
@@ -38,8 +38,8 @@ SurfacesInstance* g_surfaces_instance = nullptr;
 // static
 scoped_refptr<SurfacesInstance> SurfacesInstance::GetOrCreateInstance() {
   if (g_surfaces_instance)
-    return make_scoped_refptr(g_surfaces_instance);
-  return make_scoped_refptr(new SurfacesInstance);
+    return base::WrapRefCounted(g_surfaces_instance);
+  return base::WrapRefCounted(new SurfacesInstance);
 }
 
 SurfacesInstance::SurfacesInstance()
@@ -69,7 +69,7 @@ SurfacesInstance::SurfacesInstance()
       new viz::TextureMailboxDeleter(nullptr));
   std::unique_ptr<ParentOutputSurface> output_surface_holder(
       new ParentOutputSurface(AwRenderThreadContextProvider::Create(
-          make_scoped_refptr(new AwGLSurface),
+          base::WrapRefCounted(new AwGLSurface),
           DeferredGpuCommandService::GetInstance())));
   output_surface_ = output_surface_holder.get();
   auto scheduler = base::MakeUnique<viz::DisplayScheduler>(

diff --git a/base/memory/ref_counted.h b/base/memory/ref_counted.h
@@ -673,13 +673,6 @@ void scoped_refptr<T>::Release(T* ptr) {
   ptr->Release();
 }
 
-// DEPRECATED(crbug.com/765333): Use WrapRefCounted<T>() instead.
-// TODO(kylechar): Delete when all uses are gone.
-template <typename T>
-scoped_refptr<T> make_scoped_refptr(T* t) {
-  return scoped_refptr<T>(t);
-}
-
 template <typename T, typename U>
 bool operator==(const scoped_refptr<T>& lhs, const U* rhs) {
   return lhs.get() == rhs;

diff --git a/chrome/browser/android/compositor/layer/content_layer.cc b/chrome/browser/android/compositor/layer/content_layer.cc
@@ -19,7 +19,7 @@ namespace android {
 // static
 scoped_refptr<ContentLayer> ContentLayer::Create(
     TabContentManager* tab_content_manager) {
-  return make_scoped_refptr(new ContentLayer(tab_content_manager));
+  return base::WrapRefCounted(new ContentLayer(tab_content_manager));
 }
 
 static void SetOpacityOnLeaf(scoped_refptr<cc::Layer> layer, float alpha) {

diff --git a/chrome/browser/android/compositor/layer/contextual_search_layer.cc b/chrome/browser/android/compositor/layer/contextual_search_layer.cc
@@ -34,7 +34,7 @@ namespace android {
 // static
 scoped_refptr<ContextualSearchLayer> ContextualSearchLayer::Create(
     ui::ResourceManager* resource_manager) {
-  return make_scoped_refptr(new ContextualSearchLayer(resource_manager));
+  return base::WrapRefCounted(new ContextualSearchLayer(resource_manager));
 }
 
 void ContextualSearchLayer::SetProperties(

diff --git a/chrome/browser/android/compositor/layer/tab_handle_layer.cc b/chrome/browser/android/compositor/layer/tab_handle_layer.cc
@@ -20,7 +20,7 @@ namespace android {
 // static
 scoped_refptr<TabHandleLayer> TabHandleLayer::Create(
     LayerTitleCache* layer_title_cache) {
-  return make_scoped_refptr(new TabHandleLayer(layer_title_cache));
+  return base::WrapRefCounted(new TabHandleLayer(layer_title_cache));
 }
 
 void TabHandleLayer::SetProperties(int id,

diff --git a/chrome/browser/android/compositor/layer/tab_layer.cc b/chrome/browser/android/compositor/layer/tab_layer.cc
@@ -36,7 +36,7 @@ scoped_refptr<TabLayer> TabLayer::Create(
     ui::ResourceManager* resource_manager,
     LayerTitleCache* layer_title_cache,
     TabContentManager* tab_content_manager) {
-  return make_scoped_refptr(new TabLayer(
+  return base::WrapRefCounted(new TabLayer(
       incognito, resource_manager, layer_title_cache, tab_content_manager));
 }
 

diff --git a/chrome/browser/android/compositor/layer/thumbnail_layer.cc b/chrome/browser/android/compositor/layer/thumbnail_layer.cc
@@ -13,7 +13,7 @@ namespace android {
 
 // static
 scoped_refptr<ThumbnailLayer> ThumbnailLayer::Create() {
-  return make_scoped_refptr(new ThumbnailLayer());
+  return base::WrapRefCounted(new ThumbnailLayer());
 }
 
 void ThumbnailLayer::SetThumbnail(Thumbnail* thumbnail) {

diff --git a/chrome/browser/android/compositor/layer/toolbar_layer.cc b/chrome/browser/android/compositor/layer/toolbar_layer.cc
@@ -19,7 +19,7 @@ namespace android {
 // static
 scoped_refptr<ToolbarLayer> ToolbarLayer::Create(
     ui::ResourceManager* resource_manager) {
-  return make_scoped_refptr(new ToolbarLayer(resource_manager));
+  return base::WrapRefCounted(new ToolbarLayer(resource_manager));
 }
 
 scoped_refptr<cc::Layer> ToolbarLayer::layer() {

diff --git a/chrome/browser/android/profiles/profile_manager_utils.cc b/chrome/browser/android/profiles/profile_manager_utils.cc
@@ -41,7 +41,7 @@ void CommitPendingWritesForProfile(Profile* profile) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&FlushCookiesOnIOThread,
-                 make_scoped_refptr(profile->GetRequestContext())));
+                 base::WrapRefCounted(profile->GetRequestContext())));
   content::BrowserContext::ForEachStoragePartition(
       profile, base::Bind(FlushStoragePartition));
 }
@@ -57,7 +57,7 @@ void RemoveSessionCookiesForProfile(Profile* profile) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&RemoveSessionCookiesOnIOThread,
-                 make_scoped_refptr(profile->GetRequestContext())));
+                 base::WrapRefCounted(profile->GetRequestContext())));
 }
 
 }  // namespace

diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -3245,7 +3245,7 @@ IN_PROC_BROWSER_TEST_P(
   extensions::TestRulesRegistry* rules_registry =
       new extensions::TestRulesRegistry(
           content::BrowserThread::UI, "ui", rules_registry_id);
-  registry_service->RegisterRulesRegistry(make_scoped_refptr(rules_registry));
+  registry_service->RegisterRulesRegistry(base::WrapRefCounted(rules_registry));
 
   EXPECT_TRUE(registry_service->GetRulesRegistry(
       rules_registry_id, "ui").get());

diff --git a/chrome/browser/browsing_data/media_licenses_counter.cc b/chrome/browser/browsing_data/media_licenses_counter.cc
@@ -77,7 +77,7 @@ void MediaLicensesCounterPlugin::Count() {
   // Cancel existing requests.
   weak_ptr_factory_.InvalidateWeakPtrs();
   scoped_refptr<storage::FileSystemContext> filesystem_context =
-      make_scoped_refptr(
+      base::WrapRefCounted(
           content::BrowserContext::GetDefaultStoragePartition(profile_)
               ->GetFileSystemContext());
   base::PostTaskAndReplyWithResult(

diff --git a/chrome/browser/browsing_data/site_data_counting_helper.cc b/chrome/browser/browsing_data/site_data_counting_helper.cc
@@ -50,7 +50,7 @@ void SiteDataCountingHelper::CountAndDestroySelfWhenFinished() {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::BindOnce(&SiteDataCountingHelper::GetCookiesOnIOThread,
-                     base::Unretained(this), make_scoped_refptr(rq_context)));
+                     base::Unretained(this), base::WrapRefCounted(rq_context)));
 
   storage::QuotaManager* quota_manager = partition->GetQuotaManager();
   if (quota_manager) {
@@ -111,7 +111,7 @@ void SiteDataCountingHelper::CountAndDestroySelfWhenFinished() {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::BindOnce(&SiteDataCountingHelper::GetChannelIDsOnIOThread,
-                     base::Unretained(this), make_scoped_refptr(rq_context)));
+                     base::Unretained(this), base::WrapRefCounted(rq_context)));
 }
 
 void SiteDataCountingHelper::GetOriginsFromHostContentSettignsMap(

diff --git a/chrome/browser/browsing_data/site_data_counting_helper_unittest.cc b/chrome/browser/browsing_data/site_data_counting_helper_unittest.cc
@@ -77,7 +77,7 @@ class SiteDataCountingHelperTest : public testing::Test {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::BindOnce(&SiteDataCountingHelperTest::CreateCookiesOnIOThread,
-                       base::Unretained(this), make_scoped_refptr(rq_context),
+                       base::Unretained(this), base::WrapRefCounted(rq_context),
                        creation_time, urls));
   }
 

diff --git a/chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader.cc b/chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader.cc
@@ -65,7 +65,7 @@ int ArcContentFileSystemFileStreamReader::Read(
   file_system_operation_runner_util::OpenFileToReadOnIOThread(
       arc_url_,
       base::Bind(&ArcContentFileSystemFileStreamReader::OnOpenFile,
-                 weak_ptr_factory_.GetWeakPtr(), make_scoped_refptr(buffer),
+                 weak_ptr_factory_.GetWeakPtr(), base::WrapRefCounted(buffer),
                  buffer_length, callback));
   return net::ERR_IO_PENDING;
 }
@@ -88,7 +88,7 @@ void ArcContentFileSystemFileStreamReader::ReadInternal(
   DCHECK(file_->IsValid());
   base::PostTaskAndReplyWithResult(
       task_runner_.get(), FROM_HERE,
-      base::Bind(&ReadFile, file_.get(), make_scoped_refptr(buffer),
+      base::Bind(&ReadFile, file_.get(), base::WrapRefCounted(buffer),
                  buffer_length),
       base::Bind(&ArcContentFileSystemFileStreamReader::OnRead,
                  weak_ptr_factory_.GetWeakPtr(), callback));

diff --git a/chrome/browser/chromeos/arc/fileapi/arc_documents_provider_file_stream_reader.cc b/chrome/browser/chromeos/arc/fileapi/arc_documents_provider_file_stream_reader.cc
@@ -80,7 +80,7 @@ int ArcDocumentsProviderFileStreamReader::Read(
   if (!content_url_resolved_) {
     pending_operations_.emplace_back(base::Bind(
         &ArcDocumentsProviderFileStreamReader::RunPendingRead,
-        base::Unretained(this), base::Passed(make_scoped_refptr(buffer)),
+        base::Unretained(this), base::Passed(base::WrapRefCounted(buffer)),
         buffer_length, callback));
     return net::ERR_IO_PENDING;
   }

diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.cc b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.cc
@@ -53,15 +53,14 @@ int WebkitFileStreamReaderImpl::Read(net::IOBuffer* buffer,
   net::HttpByteRange byte_range;
   byte_range.set_first_byte_position(offset_);
   stream_reader_->Initialize(
-      drive_file_path_,
-      byte_range,
-      base::Bind(&WebkitFileStreamReaderImpl::OnStreamReaderInitialized,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 base::Bind(&WebkitFileStreamReaderImpl
-                                ::ReadAfterStreamReaderInitialized,
-                            weak_ptr_factory_.GetWeakPtr(),
-                            make_scoped_refptr(buffer),
-                            buffer_length, callback)));
+      drive_file_path_, byte_range,
+      base::Bind(
+          &WebkitFileStreamReaderImpl::OnStreamReaderInitialized,
+          weak_ptr_factory_.GetWeakPtr(),
+          base::Bind(
+              &WebkitFileStreamReaderImpl ::ReadAfterStreamReaderInitialized,
+              weak_ptr_factory_.GetWeakPtr(), base::WrapRefCounted(buffer),
+              buffer_length, callback)));
   return net::ERR_IO_PENDING;
 }
 

diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.cc b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.cc
@@ -36,7 +36,7 @@ int BufferingFileStreamReader::Read(net::IOBuffer* buffer,
   // Return as much as available in the internal buffer. It may be less than
   // |buffer_length|, what is valid.
   const int bytes_read =
-      CopyFromPreloadingBuffer(make_scoped_refptr(buffer), buffer_length);
+      CopyFromPreloadingBuffer(base::WrapRefCounted(buffer), buffer_length);
   if (bytes_read)
     return bytes_read;
 
@@ -54,13 +54,12 @@ int BufferingFileStreamReader::Read(net::IOBuffer* buffer,
   }
 
   // Nothing copied, so contents have to be preloaded.
-  Preload(base::Bind(&BufferingFileStreamReader::OnReadCompleted,
-                     weak_ptr_factory_.GetWeakPtr(),
-                     base::Bind(&BufferingFileStreamReader::OnPreloadCompleted,
-                                weak_ptr_factory_.GetWeakPtr(),
-                                make_scoped_refptr(buffer),
-                                buffer_length,
-                                callback)));
+  Preload(base::Bind(
+      &BufferingFileStreamReader::OnReadCompleted,
+      weak_ptr_factory_.GetWeakPtr(),
+      base::Bind(&BufferingFileStreamReader::OnPreloadCompleted,
+                 weak_ptr_factory_.GetWeakPtr(), base::WrapRefCounted(buffer),
+                 buffer_length, callback)));
 
   return net::ERR_IO_PENDING;
 }

diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer.cc b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer.cc
@@ -39,13 +39,11 @@ int BufferingFileStreamWriter::Write(net::IOBuffer* buffer,
           base::Bind(&BufferingFileStreamWriter::
                          OnFlushIntermediateBufferForDirectWriteCompleted,
                      weak_ptr_factory_.GetWeakPtr(),
-                     make_scoped_refptr(buffer),
-                     buffer_length,
-                     callback));
+                     base::WrapRefCounted(buffer), buffer_length, callback));
     } else {
       // Nothing to flush, so skip it.
       OnFlushIntermediateBufferForDirectWriteCompleted(
-          make_scoped_refptr(buffer), buffer_length, callback, net::OK);
+          base::WrapRefCounted(buffer), buffer_length, callback, net::OK);
     }
     return net::ERR_IO_PENDING;
   }
@@ -54,19 +52,16 @@ int BufferingFileStreamWriter::Write(net::IOBuffer* buffer,
   const int buffer_bytes =
       std::min(intermediate_buffer_length_ - buffered_bytes_, buffer_length);
 
-  CopyToIntermediateBuffer(
-      make_scoped_refptr(buffer), 0 /* buffer_offset */, buffer_bytes);
+  CopyToIntermediateBuffer(base::WrapRefCounted(buffer), 0 /* buffer_offset */,
+                           buffer_bytes);
   const int bytes_left = buffer_length - buffer_bytes;
 
   if (buffered_bytes_ == intermediate_buffer_length_) {
     FlushIntermediateBuffer(
         base::Bind(&BufferingFileStreamWriter::
                        OnFlushIntermediateBufferForBufferedWriteCompleted,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   make_scoped_refptr(buffer),
-                   buffer_bytes,
-                   bytes_left,
-                   callback));
+                   weak_ptr_factory_.GetWeakPtr(), base::WrapRefCounted(buffer),
+                   buffer_bytes, bytes_left, callback));
     return net::ERR_IO_PENDING;
   }
 

diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc
@@ -300,18 +300,16 @@ int FileStreamReader::Read(net::IOBuffer* buffer,
   switch (state_) {
     case NOT_INITIALIZED:
       // Lazily initialize with the first call to Read().
-    Initialize(base::Bind(&FileStreamReader::ReadAfterInitialized,
-                          weak_ptr_factory_.GetWeakPtr(),
-                          make_scoped_refptr(buffer),
-                          buffer_length,
-                          base::Bind(&FileStreamReader::OnReadCompleted,
-                                     weak_ptr_factory_.GetWeakPtr(),
-                                     callback)),
-               base::Bind(&Int64ToIntCompletionCallback,
-                          base::Bind(&FileStreamReader::OnReadCompleted,
-                                     weak_ptr_factory_.GetWeakPtr(),
-                                     callback)));
-    break;
+      Initialize(
+          base::Bind(&FileStreamReader::ReadAfterInitialized,
+                     weak_ptr_factory_.GetWeakPtr(),
+                     base::WrapRefCounted(buffer), buffer_length,
+                     base::Bind(&FileStreamReader::OnReadCompleted,
+                                weak_ptr_factory_.GetWeakPtr(), callback)),
+          base::Bind(&Int64ToIntCompletionCallback,
+                     base::Bind(&FileStreamReader::OnReadCompleted,
+                                weak_ptr_factory_.GetWeakPtr(), callback)));
+      break;
 
     case INITIALIZING:
       NOTREACHED();

diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.cc
@@ -209,16 +209,14 @@ int FileStreamWriter::Write(net::IOBuffer* buffer,
   switch (state_) {
     case NOT_INITIALIZED:
       // Lazily initialize with the first call to Write().
-      Initialize(base::Bind(&FileStreamWriter::WriteAfterInitialized,
-                            weak_ptr_factory_.GetWeakPtr(),
-                            make_scoped_refptr(buffer),
-                            buffer_length,
-                            base::Bind(&FileStreamWriter::OnWriteCompleted,
-                                       weak_ptr_factory_.GetWeakPtr(),
-                                       callback)),
-                 base::Bind(&FileStreamWriter::OnWriteCompleted,
-                            weak_ptr_factory_.GetWeakPtr(),
-                            callback));
+      Initialize(
+          base::Bind(&FileStreamWriter::WriteAfterInitialized,
+                     weak_ptr_factory_.GetWeakPtr(),
+                     base::WrapRefCounted(buffer), buffer_length,
+                     base::Bind(&FileStreamWriter::OnWriteCompleted,
+                                weak_ptr_factory_.GetWeakPtr(), callback)),
+          base::Bind(&FileStreamWriter::OnWriteCompleted,
+                     weak_ptr_factory_.GetWeakPtr(), callback));
       break;
 
     case INITIALIZING:

diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.cc b/chrome/browser/chromeos/file_system_provider/provided_file_system.cc
@@ -403,7 +403,7 @@ AbortCallback ProvidedFileSystem::WriteFile(
       WRITE_FILE,
       base::WrapUnique<RequestManager::HandlerInterface>(
           new operations::WriteFile(event_router_, file_system_info_,
-                                    file_handle, make_scoped_refptr(buffer),
+                                    file_handle, base::WrapRefCounted(buffer),
                                     offset, length, callback)));
   if (!request_id) {
     callback.Run(base::File::FILE_ERROR_SECURITY);

diff --git a/chrome/browser/chromeos/fileapi/recent_download_source.cc b/chrome/browser/chromeos/fileapi/recent_download_source.cc
@@ -109,11 +109,11 @@ void RecentDownloadSource::ScanDirectory(const base::FilePath& path) {
   ++inflight_readdirs_;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      base::BindOnce(&ReadDirectoryOnIOThread,
-                     make_scoped_refptr(params_.value().file_system_context()),
-                     url,
-                     base::Bind(&RecentDownloadSource::OnReadDirectory,
-                                weak_ptr_factory_.GetWeakPtr(), path)));
+      base::BindOnce(
+          &ReadDirectoryOnIOThread,
+          base::WrapRefCounted(params_.value().file_system_context()), url,
+          base::Bind(&RecentDownloadSource::OnReadDirectory,
+                     weak_ptr_factory_.GetWeakPtr(), path)));
 }
 
 void RecentDownloadSource::OnReadDirectory(
@@ -135,7 +135,7 @@ void RecentDownloadSource::OnReadDirectory(
           BrowserThread::IO, FROM_HERE,
           base::BindOnce(
               &GetMetadataOnIOThread,
-              make_scoped_refptr(params_.value().file_system_context()), url,
+              base::WrapRefCounted(params_.value().file_system_context()), url,
               storage::FileSystemOperation::GET_METADATA_FIELD_LAST_MODIFIED,
               base::Bind(&RecentDownloadSource::OnGetMetadata,
                          weak_ptr_factory_.GetWeakPtr(), url)));

diff --git a/chrome/browser/chromeos/fileapi/recent_drive_source.cc b/chrome/browser/chromeos/fileapi/recent_drive_source.cc
@@ -119,7 +119,7 @@ void RecentDriveSource::OnSearchMetadata(
         BrowserThread::IO, FROM_HERE,
         base::BindOnce(
             &GetMetadataOnIOThread,
-            make_scoped_refptr(params_.value().file_system_context()), url,
+            base::WrapRefCounted(params_.value().file_system_context()), url,
             storage::FileSystemOperation::GET_METADATA_FIELD_LAST_MODIFIED,
             base::Bind(&RecentDriveSource::OnGetMetadata,
                        weak_ptr_factory_.GetWeakPtr(), url)));

diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -189,7 +189,7 @@ TEST_F(PrefProviderTest, Incognito) {
       new OverlayUserPrefStore(user_prefs);
 
   sync_preferences::PrefServiceMockFactory factory;
-  factory.set_user_prefs(make_scoped_refptr(user_prefs));
+  factory.set_user_prefs(base::WrapRefCounted(user_prefs));
   scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
       new user_prefs::PrefRegistrySyncable);
   sync_preferences::PrefServiceSyncable* regular_prefs =
@@ -198,7 +198,7 @@ TEST_F(PrefProviderTest, Incognito) {
   chrome::RegisterUserProfilePrefs(registry.get());
 
   sync_preferences::PrefServiceMockFactory otr_factory;
-  otr_factory.set_user_prefs(make_scoped_refptr(otr_user_prefs));
+  otr_factory.set_user_prefs(base::WrapRefCounted(otr_user_prefs));
   scoped_refptr<user_prefs::PrefRegistrySyncable> otr_registry(
       new user_prefs::PrefRegistrySyncable);
   sync_preferences::PrefServiceSyncable* otr_prefs =

diff --git a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
@@ -435,7 +435,7 @@ class MockUsbDevice : public UsbDevice {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::BindOnce(std::move(callback),
-                       make_scoped_refptr(new MockUsbDeviceHandle<T>(this))));
+                       base::WrapRefCounted(new MockUsbDeviceHandle<T>(this))));
   }
 
   void set_open(bool open) { open_ = open; }