Switch make_scoped_refptr to MakeRefCounted.
This CL replaces instances of make_scoped_refptr() with MakeRefCounted()
for constructing scoped_refptr<>s where possible. MakeRefCounted() only
works if the class has a public constructor, so not all instances are
replaced.
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: Ic53d512940f7cc53a959e967a63da0ca94a95eae
Reviewed-on: https://chromium-review.googlesource.com/676646
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@{#504151}diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 5b26cd6..baa76ec 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -247,13 +247,13 @@
safe_browsing::RegisterProfilePrefs(pref_registry);
PrefServiceFactory pref_service_factory;
- pref_service_factory.set_user_prefs(make_scoped_refptr(
- new InMemoryPrefStore()));
+ pref_service_factory.set_user_prefs(
+ base::MakeRefCounted<InMemoryPrefStore>());
pref_service_factory.set_managed_prefs(
- make_scoped_refptr(new policy::ConfigurationPolicyPrefStore(
+ base::MakeRefCounted<policy::ConfigurationPolicyPrefStore>(
browser_policy_connector_->GetPolicyService(),
browser_policy_connector_->GetHandlerList(),
- policy::POLICY_LEVEL_MANDATORY)));
+ policy::POLICY_LEVEL_MANDATORY));
pref_service_factory.set_read_error_callback(base::Bind(&HandleReadError));
user_pref_service_ = pref_service_factory.Create(pref_registry);
pref_change_registrar_.Init(user_pref_service_.get());
diff --git a/android_webview/browser/aw_field_trial_creator.cc b/android_webview/browser/aw_field_trial_creator.cc
index e0c8094..7eea8d9 100644
--- a/android_webview/browser/aw_field_trial_creator.cc
+++ b/android_webview/browser/aw_field_trial_creator.cc
@@ -70,7 +70,7 @@
base::MakeUnique<base::ListValue>());
pref_service_factory_.set_user_prefs(
- make_scoped_refptr(new InMemoryPrefStore()));
+ base::MakeRefCounted<InMemoryPrefStore>());
return pref_service_factory_.Create(pref_registry.get());
}
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index 41e7f48e..afe67c719 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -1472,12 +1472,12 @@
display::ManagedDisplayInfo native_display_info =
CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1000, 500));
display::ManagedDisplayInfo::ManagedDisplayModeList display_modes;
- display_modes.push_back(make_scoped_refptr(new display::ManagedDisplayMode(
- gfx::Size(1000, 500), 58.0f, false, true)));
- display_modes.push_back(make_scoped_refptr(new display::ManagedDisplayMode(
- gfx::Size(800, 300), 59.0f, false, false)));
- display_modes.push_back(make_scoped_refptr(new display::ManagedDisplayMode(
- gfx::Size(400, 500), 60.0f, false, false)));
+ display_modes.push_back(base::MakeRefCounted<display::ManagedDisplayMode>(
+ gfx::Size(1000, 500), 58.0f, false, true));
+ display_modes.push_back(base::MakeRefCounted<display::ManagedDisplayMode>(
+ gfx::Size(800, 300), 59.0f, false, false));
+ display_modes.push_back(base::MakeRefCounted<display::ManagedDisplayMode>(
+ gfx::Size(400, 500), 60.0f, false, false));
native_display_info.SetManagedDisplayModes(display_modes);
@@ -1539,12 +1539,12 @@
display::ManagedDisplayInfo native_display_info =
CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1000, 500));
display::ManagedDisplayInfo::ManagedDisplayModeList display_modes;
- display_modes.push_back(make_scoped_refptr(new display::ManagedDisplayMode(
- gfx::Size(1000, 500), 58.0f, false, true)));
- display_modes.push_back(make_scoped_refptr(new display::ManagedDisplayMode(
- gfx::Size(800, 300), 59.0f, false, false)));
- display_modes.push_back(make_scoped_refptr(new display::ManagedDisplayMode(
- gfx::Size(400, 500), 60.0f, false, false)));
+ display_modes.push_back(base::MakeRefCounted<display::ManagedDisplayMode>(
+ gfx::Size(1000, 500), 58.0f, false, true));
+ display_modes.push_back(base::MakeRefCounted<display::ManagedDisplayMode>(
+ gfx::Size(800, 300), 59.0f, false, false));
+ display_modes.push_back(base::MakeRefCounted<display::ManagedDisplayMode>(
+ gfx::Size(400, 500), 60.0f, false, false));
display::ManagedDisplayInfo::ManagedDisplayModeList copy = display_modes;
native_display_info.SetManagedDisplayModes(copy);
diff --git a/base/ios/scoped_critical_action.mm b/base/ios/scoped_critical_action.mm
index 3828fbc..dbfbd45 100644
--- a/base/ios/scoped_critical_action.mm
+++ b/base/ios/scoped_critical_action.mm
@@ -14,7 +14,7 @@
namespace ios {
ScopedCriticalAction::ScopedCriticalAction()
- : core_(base::MakeRefCounted<ScopedCriticalAction::Core>()) {
+ : core_(MakeRefCounted<ScopedCriticalAction::Core>()) {
ScopedCriticalAction::Core::StartBackgroundTask(core_);
}
diff --git a/base/observer_list_unittest.cc b/base/observer_list_unittest.cc
index 21257e1..16bd088f 100644
--- a/base/observer_list_unittest.cc
+++ b/base/observer_list_unittest.cc
@@ -532,7 +532,7 @@
auto task_runner_1 = CreateSequencedTaskRunnerWithTraits(TaskTraits());
auto task_runner_2 = CreateSequencedTaskRunnerWithTraits(TaskTraits());
- auto observer_list = make_scoped_refptr(new ObserverListThreadSafe<Foo>());
+ auto observer_list = MakeRefCounted<ObserverListThreadSafe<Foo>>();
SequenceVerificationObserver observer_1(task_runner_1);
SequenceVerificationObserver observer_2(task_runner_2);
@@ -558,7 +558,7 @@
// from a notification, it is itself notified.
TEST(ObserverListThreadSafeTest, AddObserverFromNotificationNotifyAll) {
test::ScopedTaskEnvironment scoped_task_environment;
- auto observer_list = make_scoped_refptr(new ObserverListThreadSafe<Foo>());
+ auto observer_list = MakeRefCounted<ObserverListThreadSafe<Foo>>();
Adder observer_added_from_notification(1);
@@ -605,7 +605,7 @@
// Verify that there is no crash when an observer is removed while it is being
// notified.
TEST(ObserverListThreadSafeTest, RemoveWhileNotificationIsRunning) {
- auto observer_list = make_scoped_refptr(new ObserverListThreadSafe<Foo>());
+ auto observer_list = MakeRefCounted<ObserverListThreadSafe<Foo>>();
RemoveWhileNotificationIsRunningObserver observer;
WaitableEvent task_running(WaitableEvent::ResetPolicy::AUTOMATIC,
diff --git a/base/task_scheduler/delayed_task_manager_unittest.cc b/base/task_scheduler/delayed_task_manager_unittest.cc
index 23cdb0ca..b3dbf07 100644
--- a/base/task_scheduler/delayed_task_manager_unittest.cc
+++ b/base/task_scheduler/delayed_task_manager_unittest.cc
@@ -61,7 +61,7 @@
testing::StrictMock<MockTaskTarget> task_target_;
const scoped_refptr<TestMockTimeTaskRunner> service_thread_task_runner_ =
- make_scoped_refptr(new TestMockTimeTaskRunner);
+ MakeRefCounted<TestMockTimeTaskRunner>();
DelayedTaskManager delayed_task_manager_;
std::unique_ptr<Task> task_ = CreateTask(kLongDelay);
Task* const task_raw_ = task_.get();
diff --git a/base/task_scheduler/scheduler_single_thread_task_runner_manager.cc b/base/task_scheduler/scheduler_single_thread_task_runner_manager.cc
index a3a493f..472931ca 100644
--- a/base/task_scheduler/scheduler_single_thread_task_runner_manager.cc
+++ b/base/task_scheduler/scheduler_single_thread_task_runner_manager.cc
@@ -514,9 +514,9 @@
ThreadPriority priority_hint) {
lock_.AssertAcquired();
int id = next_worker_id_++;
- workers_.emplace_back(make_scoped_refptr(new SchedulerWorker(
+ workers_.emplace_back(MakeRefCounted<SchedulerWorker>(
priority_hint, CreateSchedulerWorkerDelegate<DelegateType>(name, id),
- task_tracker_)));
+ task_tracker_));
return workers_.back().get();
}
diff --git a/base/task_scheduler/scheduler_worker_stack_unittest.cc b/base/task_scheduler/scheduler_worker_stack_unittest.cc
index bdb2778..d159c64 100644
--- a/base/task_scheduler/scheduler_worker_stack_unittest.cc
+++ b/base/task_scheduler/scheduler_worker_stack_unittest.cc
@@ -40,17 +40,17 @@
class TaskSchedulerWorkerStackTest : public testing::Test {
protected:
void SetUp() override {
- worker_a_ = make_scoped_refptr(new SchedulerWorker(
+ worker_a_ = MakeRefCounted<SchedulerWorker>(
ThreadPriority::NORMAL, WrapUnique(new MockSchedulerWorkerDelegate),
- &task_tracker_));
+ &task_tracker_);
ASSERT_TRUE(worker_a_);
- worker_b_ = make_scoped_refptr(new SchedulerWorker(
+ worker_b_ = MakeRefCounted<SchedulerWorker>(
ThreadPriority::NORMAL, WrapUnique(new MockSchedulerWorkerDelegate),
- &task_tracker_));
+ &task_tracker_);
ASSERT_TRUE(worker_b_);
- worker_c_ = make_scoped_refptr(new SchedulerWorker(
+ worker_c_ = MakeRefCounted<SchedulerWorker>(
ThreadPriority::NORMAL, WrapUnique(new MockSchedulerWorkerDelegate),
- &task_tracker_));
+ &task_tracker_);
ASSERT_TRUE(worker_c_);
}
diff --git a/base/task_scheduler/scheduler_worker_unittest.cc b/base/task_scheduler/scheduler_worker_unittest.cc
index e7d98da9..2308f02b 100644
--- a/base/task_scheduler/scheduler_worker_unittest.cc
+++ b/base/task_scheduler/scheduler_worker_unittest.cc
@@ -77,9 +77,9 @@
WaitableEvent::InitialState::NOT_SIGNALED) {}
void SetUp() override {
- worker_ = make_scoped_refptr(new SchedulerWorker(
+ worker_ = MakeRefCounted<SchedulerWorker>(
ThreadPriority::NORMAL,
- std::make_unique<TestSchedulerWorkerDelegate>(this), &task_tracker_));
+ std::make_unique<TestSchedulerWorkerDelegate>(this), &task_tracker_);
ASSERT_TRUE(worker_);
worker_->Start();
worker_set_.Signal();
@@ -512,8 +512,8 @@
delegate->controls();
controls->set_can_cleanup(true);
EXPECT_CALL(*delegate, OnMainEntry(_));
- auto worker = make_scoped_refptr(new SchedulerWorker(
- ThreadPriority::NORMAL, WrapUnique(delegate), &task_tracker));
+ auto worker = MakeRefCounted<SchedulerWorker>(
+ ThreadPriority::NORMAL, WrapUnique(delegate), &task_tracker);
worker->Start();
worker->WakeUp();
controls->WaitForWorkToRun();
@@ -533,8 +533,8 @@
controls->HaveWorkBlock();
- auto worker = make_scoped_refptr(new SchedulerWorker(
- ThreadPriority::NORMAL, std::move(delegate), &task_tracker));
+ auto worker = MakeRefCounted<SchedulerWorker>(
+ ThreadPriority::NORMAL, std::move(delegate), &task_tracker);
worker->Start();
worker->WakeUp();
@@ -555,8 +555,8 @@
scoped_refptr<ControllableCleanupDelegate::Controls> controls =
delegate->controls();
- auto worker = make_scoped_refptr(new SchedulerWorker(
- ThreadPriority::NORMAL, std::move(delegate), &task_tracker));
+ auto worker = MakeRefCounted<SchedulerWorker>(
+ ThreadPriority::NORMAL, std::move(delegate), &task_tracker);
worker->Start();
worker->WakeUp();
@@ -578,8 +578,8 @@
controls->HaveWorkBlock();
- auto worker = make_scoped_refptr(new SchedulerWorker(
- ThreadPriority::NORMAL, std::move(delegate), &task_tracker));
+ auto worker = MakeRefCounted<SchedulerWorker>(
+ ThreadPriority::NORMAL, std::move(delegate), &task_tracker);
worker->Start();
worker->WakeUp();
@@ -603,8 +603,8 @@
delegate->controls();
controls->set_expect_get_work(false);
- auto worker = make_scoped_refptr(new SchedulerWorker(
- ThreadPriority::NORMAL, std::move(delegate), &task_tracker));
+ auto worker = MakeRefCounted<SchedulerWorker>(
+ ThreadPriority::NORMAL, std::move(delegate), &task_tracker);
worker->Cleanup();
worker->Start();
@@ -652,8 +652,8 @@
controls->HaveWorkBlock();
- auto worker = make_scoped_refptr(new SchedulerWorker(
- ThreadPriority::NORMAL, std::move(delegate), &task_tracker));
+ auto worker = MakeRefCounted<SchedulerWorker>(
+ ThreadPriority::NORMAL, std::move(delegate), &task_tracker);
worker->Start();
worker->WakeUp();
@@ -731,8 +731,8 @@
? ThreadPriority::BACKGROUND
: ThreadPriority::NORMAL);
- auto worker = make_scoped_refptr(new SchedulerWorker(
- ThreadPriority::BACKGROUND, std::move(delegate), &task_tracker));
+ auto worker = MakeRefCounted<SchedulerWorker>(
+ ThreadPriority::BACKGROUND, std::move(delegate), &task_tracker);
worker->Start();
// Verify that the initial thread priority is BACKGROUND (or NORMAL if thread
@@ -791,9 +791,9 @@
// Create a worker with backward compatibility ENABLED. Wake it up and wait
// until GetWork() returns.
- auto worker = make_scoped_refptr(new SchedulerWorker(
+ auto worker = MakeRefCounted<SchedulerWorker>(
ThreadPriority::NORMAL, std::move(delegate), &task_tracker, nullptr,
- SchedulerBackwardCompatibility::INIT_COM_STA));
+ SchedulerBackwardCompatibility::INIT_COM_STA);
worker->Start();
worker->WakeUp();
delegate_raw->WaitUntilGetWorkReturned();
@@ -818,9 +818,9 @@
// Create a worker with backward compatibility DISABLED. Wake it up and wait
// until GetWork() returns.
- auto worker = make_scoped_refptr(new SchedulerWorker(
+ auto worker = MakeRefCounted<SchedulerWorker>(
ThreadPriority::NORMAL, std::move(delegate), &task_tracker, nullptr,
- SchedulerBackwardCompatibility::DISABLED));
+ SchedulerBackwardCompatibility::DISABLED);
worker->Start();
worker->WakeUp();
delegate_raw->WaitUntilGetWorkReturned();
diff --git a/base/threading/post_task_and_reply_impl_unittest.cc b/base/threading/post_task_and_reply_impl_unittest.cc
index 9578071..6678c95 100644
--- a/base/threading/post_task_and_reply_impl_unittest.cc
+++ b/base/threading/post_task_and_reply_impl_unittest.cc
@@ -73,13 +73,12 @@
testing::StrictMock<MockObject> mock_object;
bool delete_flag = false;
- EXPECT_TRUE(
- PostTaskAndReplyTaskRunner(post_runner.get())
- .PostTaskAndReply(
- FROM_HERE,
- BindOnce(&MockObject::Task, Unretained(&mock_object),
- make_scoped_refptr(new ObjectToDelete(&delete_flag))),
- BindOnce(&MockObject::Reply, Unretained(&mock_object))));
+ EXPECT_TRUE(PostTaskAndReplyTaskRunner(post_runner.get())
+ .PostTaskAndReply(
+ FROM_HERE,
+ BindOnce(&MockObject::Task, Unretained(&mock_object),
+ MakeRefCounted<ObjectToDelete>(&delete_flag)),
+ BindOnce(&MockObject::Reply, Unretained(&mock_object))));
// Expect the task to be posted to |post_runner|.
EXPECT_TRUE(post_runner->HasPendingTask());
diff --git a/base/threading/sequenced_worker_pool_unittest.cc b/base/threading/sequenced_worker_pool_unittest.cc
index afa9c5a..8afd5a1 100644
--- a/base/threading/sequenced_worker_pool_unittest.cc
+++ b/base/threading/sequenced_worker_pool_unittest.cc
@@ -393,7 +393,7 @@
EXPECT_TRUE(pool()->PostDelayedTask(
FROM_HERE,
base::BindOnce(&ShouldNotRun,
- make_scoped_refptr(new DeletionHelper(deleted_flag))),
+ MakeRefCounted<DeletionHelper>(deleted_flag)),
TestTimeouts::action_timeout()));
std::vector<int> completion_sequence = tracker()->WaitUntilTasksComplete(1);
diff --git a/base/threading/thread_checker_unittest.cc b/base/threading/thread_checker_unittest.cc
index cc40974..e258bfc2 100644
--- a/base/threading/thread_checker_unittest.cc
+++ b/base/threading/thread_checker_unittest.cc
@@ -63,7 +63,7 @@
ThreadCheckerImpl* thread_checker,
SequenceToken sequence_token) {
ThreadTaskRunnerHandle thread_task_runner_handle(
- make_scoped_refptr(new TestSimpleTaskRunner));
+ MakeRefCounted<TestSimpleTaskRunner>());
ScopedSetSequenceTokenForCurrentThread
scoped_set_sequence_token_for_current_thread(sequence_token);
ExpectNotCalledOnValidThread(thread_checker);
@@ -79,7 +79,7 @@
TEST(ThreadCheckerTest,
AllowedSameThreadAndSequenceDifferentTasksWithThreadTaskRunnerHandle) {
ThreadTaskRunnerHandle thread_task_runner_handle(
- make_scoped_refptr(new TestSimpleTaskRunner));
+ MakeRefCounted<TestSimpleTaskRunner>());
std::unique_ptr<ThreadCheckerImpl> thread_checker;
const SequenceToken sequence_token = SequenceToken::Create();
@@ -130,7 +130,7 @@
TEST(ThreadCheckerTest, DisallowedDifferentThreadsSameSequence) {
ThreadTaskRunnerHandle thread_task_runner_handle(
- make_scoped_refptr(new TestSimpleTaskRunner));
+ MakeRefCounted<TestSimpleTaskRunner>());
const SequenceToken sequence_token(SequenceToken::Create());
ScopedSetSequenceTokenForCurrentThread
@@ -147,7 +147,7 @@
std::unique_ptr<ThreadCheckerImpl> thread_checker;
ThreadTaskRunnerHandle thread_task_runner_handle(
- make_scoped_refptr(new TestSimpleTaskRunner));
+ MakeRefCounted<TestSimpleTaskRunner>());
{
ScopedSetSequenceTokenForCurrentThread
@@ -180,7 +180,7 @@
TEST(ThreadCheckerTest, DetachFromThreadWithSequenceToken) {
ThreadTaskRunnerHandle thread_task_runner_handle(
- make_scoped_refptr(new TestSimpleTaskRunner));
+ MakeRefCounted<TestSimpleTaskRunner>());
ScopedSetSequenceTokenForCurrentThread
scoped_set_sequence_token_for_current_thread(SequenceToken::Create());
ThreadCheckerImpl thread_checker;
diff --git a/base/trace_event/memory_dump_manager_unittest.cc b/base/trace_event/memory_dump_manager_unittest.cc
index 6d4925b9..30a69ea 100644
--- a/base/trace_event/memory_dump_manager_unittest.cc
+++ b/base/trace_event/memory_dump_manager_unittest.cc
@@ -508,9 +508,9 @@
InitializeMemoryDumpManagerForInProcessTesting(false /* is_coordinator */);
std::vector<MockMemoryDumpProvider> mdps(3);
scoped_refptr<TestSequencedTaskRunner> task_runner1(
- make_scoped_refptr(new TestSequencedTaskRunner()));
+ MakeRefCounted<TestSequencedTaskRunner>());
scoped_refptr<TestSequencedTaskRunner> task_runner2(
- make_scoped_refptr(new TestSequencedTaskRunner()));
+ MakeRefCounted<TestSequencedTaskRunner>());
RegisterDumpProviderWithSequencedTaskRunner(&mdps[0], task_runner1,
kDefaultOptions);
RegisterDumpProviderWithSequencedTaskRunner(&mdps[1], task_runner2,
diff --git a/cc/base/delayed_unique_notifier_unittest.cc b/cc/base/delayed_unique_notifier_unittest.cc
index bbd2db5..bc1dfc4 100644
--- a/cc/base/delayed_unique_notifier_unittest.cc
+++ b/cc/base/delayed_unique_notifier_unittest.cc
@@ -37,7 +37,7 @@
void SetUp() override {
notification_count_ = 0;
- task_runner_ = make_scoped_refptr(new base::TestSimpleTaskRunner);
+ task_runner_ = base::MakeRefCounted<base::TestSimpleTaskRunner>();
}
void Notify() { ++notification_count_; }
diff --git a/cc/blink/web_content_layer_impl.cc b/cc/blink/web_content_layer_impl.cc
index fe7d016..c72dffe 100644
--- a/cc/blink/web_content_layer_impl.cc
+++ b/cc/blink/web_content_layer_impl.cc
@@ -76,7 +76,7 @@
scoped_refptr<cc::DisplayItemList>
WebContentLayerImpl::PaintContentsToDisplayList(
cc::ContentLayerClient::PaintingControlSetting painting_control) {
- auto display_list = make_scoped_refptr(new cc::DisplayItemList);
+ auto display_list = base::MakeRefCounted<cc::DisplayItemList>();
if (client_) {
WebDisplayItemListImpl list(display_list.get());
client_->PaintContents(&list, PaintingControlToWeb(painting_control));
diff --git a/cc/blink/web_display_item_list_impl_unittest.cc b/cc/blink/web_display_item_list_impl_unittest.cc
index 1cdabf3..19f1f1657 100644
--- a/cc/blink/web_display_item_list_impl_unittest.cc
+++ b/cc/blink/web_display_item_list_impl_unittest.cc
@@ -36,7 +36,7 @@
clip_bounds.x, clip_bounds.y, clip_bounds.width, clip_bounds.height);
SkIRect clip_irect = sk_clip_bounds.roundOut();
- auto cc_list = make_scoped_refptr(new cc::DisplayItemList);
+ auto cc_list = base::MakeRefCounted<cc::DisplayItemList>();
cc_blink::WebDisplayItemListImpl web_list(cc_list.get());
// drawColor(background color)
diff --git a/cc/paint/display_item_list_unittest.cc b/cc/paint/display_item_list_unittest.cc
index 5fec9fb..c0308cd 100644
--- a/cc/paint/display_item_list_unittest.cc
+++ b/cc/paint/display_item_list_unittest.cc
@@ -72,7 +72,7 @@
PaintFlags red_paint;
red_paint.setColor(SK_ColorRED);
unsigned char pixels[4 * 100 * 100] = {0};
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
gfx::Point offset(8, 9);
@@ -108,7 +108,7 @@
TEST(DisplayItemListTest, EmptyUnpairedRangeDoesNotAddVisualRect) {
gfx::Rect layer_rect(100, 100);
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
{
list->StartPaint();
@@ -134,7 +134,7 @@
PaintFlags red_paint;
red_paint.setColor(SK_ColorRED);
unsigned char pixels[4 * 100 * 100] = {0};
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
gfx::Point first_offset(8, 9);
gfx::Rect first_recording_rect(first_offset, layer_rect.size());
@@ -208,7 +208,7 @@
PaintFlags red_paint;
red_paint.setColor(SK_ColorRED);
unsigned char pixels[4 * 100 * 100] = {0};
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
gfx::Point first_offset(8, 9);
gfx::Rect first_recording_rect(first_offset, layer_rect.size());
@@ -277,7 +277,7 @@
gfx::Rect layer_rect(100, 100);
FilterOperations filters;
unsigned char pixels[4 * 100 * 100] = {0};
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
sk_sp<SkSurface> source_surface = SkSurface::MakeRasterN32Premul(50, 50);
SkCanvas* source_canvas = source_surface->getCanvas();
@@ -359,7 +359,7 @@
const int kNumPaintOps = 1000;
size_t memory_usage;
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
gfx::Rect layer_rect(100, 100);
PaintFlags blue_flags;
@@ -378,7 +378,7 @@
}
TEST(DisplayItemListTest, AsValueWithNoOps) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
list->Finalize();
// Pass |true| to ask for PaintOps even though there are none.
@@ -439,7 +439,7 @@
TEST(DisplayItemListTest, AsValueWithOps) {
gfx::Rect layer_rect = gfx::Rect(1, 2, 8, 9);
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
gfx::Transform transform;
transform.Translate(6.f, 7.f);
@@ -540,12 +540,12 @@
}
TEST(DisplayItemListTest, SizeEmpty) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
EXPECT_EQ(0u, list->op_count());
}
TEST(DisplayItemListTest, SizeOne) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
gfx::Rect drawing_bounds(5, 6, 1, 1);
{
list->StartPaint();
@@ -556,7 +556,7 @@
}
TEST(DisplayItemListTest, SizeMultiple) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
gfx::Rect clip_bounds(5, 6, 7, 8);
{
list->StartPaint();
@@ -574,7 +574,7 @@
}
TEST(DisplayItemListTest, AppendVisualRectSimple) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
// One drawing: D.
@@ -590,7 +590,7 @@
}
TEST(DisplayItemListTest, AppendVisualRectEmptyBlock) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
// One block: B1, E1.
@@ -615,7 +615,7 @@
}
TEST(DisplayItemListTest, AppendVisualRectEmptyBlockContainingEmptyBlock) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
// Two nested blocks: B1, B2, E2, E1.
@@ -654,7 +654,7 @@
}
TEST(DisplayItemListTest, AppendVisualRectBlockContainingDrawing) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
// One block with one drawing: B1, Da, E1.
@@ -688,7 +688,7 @@
}
TEST(DisplayItemListTest, AppendVisualRectBlockContainingEscapedDrawing) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
// One block with one drawing: B1, Da (escapes), E1.
@@ -723,7 +723,7 @@
TEST(DisplayItemListTest,
AppendVisualRectDrawingFollowedByBlockContainingEscapedDrawing) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
// One drawing followed by one block with one drawing: Da, B1, Db (escapes),
// E1.
@@ -766,7 +766,7 @@
}
TEST(DisplayItemListTest, AppendVisualRectTwoBlocksTwoDrawings) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
// Multiple nested blocks with drawings amidst: B1, Da, B2, Db, E2, E1.
@@ -828,7 +828,7 @@
TEST(DisplayItemListTest,
AppendVisualRectTwoBlocksTwoDrawingsInnerDrawingEscaped) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
// Multiple nested blocks with drawings amidst: B1, Da, B2, Db (escapes), E2,
// E1.
@@ -891,7 +891,7 @@
TEST(DisplayItemListTest,
AppendVisualRectTwoBlocksTwoDrawingsOuterDrawingEscaped) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
// Multiple nested blocks with drawings amidst: B1, Da (escapes), B2, Db, E2,
// E1.
@@ -954,7 +954,7 @@
TEST(DisplayItemListTest,
AppendVisualRectTwoBlocksTwoDrawingsBothDrawingsEscaped) {
- auto list = make_scoped_refptr(new DisplayItemList);
+ auto list = base::MakeRefCounted<DisplayItemList>();
// Multiple nested blocks with drawings amidst:
// B1, Da (escapes to the right), B2, Db (escapes to the left), E2, E1.
diff --git a/cc/raster/raster_buffer_provider_perftest.cc b/cc/raster/raster_buffer_provider_perftest.cc
index 2e1d247..c1f60362 100644
--- a/cc/raster/raster_buffer_provider_perftest.cc
+++ b/cc/raster/raster_buffer_provider_perftest.cc
@@ -221,8 +221,8 @@
RasterBufferProviderPerfTestBase()
: compositor_context_provider_(
- make_scoped_refptr(new PerfContextProvider)),
- worker_context_provider_(make_scoped_refptr(new PerfContextProvider)),
+ base::MakeRefCounted<PerfContextProvider>()),
+ worker_context_provider_(base::MakeRefCounted<PerfContextProvider>()),
task_runner_(new base::TestSimpleTaskRunner),
task_graph_runner_(new SynchronousTaskGraphRunner),
timer_(kWarmupRuns,
diff --git a/cc/raster/task_graph_runner_perftest.cc b/cc/raster/task_graph_runner_perftest.cc
index 62b1d62..456abad5 100644
--- a/cc/raster/task_graph_runner_perftest.cc
+++ b/cc/raster/task_graph_runner_perftest.cc
@@ -224,7 +224,7 @@
void CreateTasks(int num_tasks, PerfTaskImpl::Vector* tasks) {
for (int i = 0; i < num_tasks; ++i)
- tasks->push_back(make_scoped_refptr(new PerfTaskImpl));
+ tasks->push_back(base::MakeRefCounted<PerfTaskImpl>());
}
void CancelTasks(const PerfTaskImpl::Vector& tasks) {
diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc
index c495e97..773bcf9 100644
--- a/cc/test/fake_content_layer_client.cc
+++ b/cc/test/fake_content_layer_client.cc
@@ -45,7 +45,7 @@
scoped_refptr<DisplayItemList>
FakeContentLayerClient::PaintContentsToDisplayList(
PaintingControlSetting painting_control) {
- auto display_list = make_scoped_refptr(new DisplayItemList);
+ auto display_list = base::MakeRefCounted<DisplayItemList>();
for (RectPaintVector::const_iterator it = draw_rects_.begin();
it != draw_rects_.end(); ++it) {
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index 0e0a8cc2..bd6901628 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -75,7 +75,7 @@
// mimic texture transport from the renderer process to the Display
// compositor.
auto display_context_provider =
- make_scoped_refptr(new TestInProcessContextProvider(nullptr));
+ base::MakeRefCounted<TestInProcessContextProvider>(nullptr);
display_context_provider->BindToCurrentThread();
bool flipped_output_surface = false;
diff --git a/cc/tiles/gpu_image_decode_cache.cc b/cc/tiles/gpu_image_decode_cache.cc
index 6c2028f..b6a06b2 100644
--- a/cc/tiles/gpu_image_decode_cache.cc
+++ b/cc/tiles/gpu_image_decode_cache.cc
@@ -518,10 +518,10 @@
// Ref image and create a upload and decode tasks. We will release this ref
// in UploadTaskCompleted.
RefImage(draw_image);
- task = make_scoped_refptr(new ImageUploadTaskImpl(
+ task = base::MakeRefCounted<ImageUploadTaskImpl>(
this, draw_image,
GetImageDecodeTaskAndRef(draw_image, tracing_info, task_type),
- tracing_info));
+ tracing_info);
image_data->upload.task = task;
} else {
task = GetImageDecodeTaskAndRef(draw_image, tracing_info, task_type);
diff --git a/cc/tiles/image_controller_unittest.cc b/cc/tiles/image_controller_unittest.cc
index 081c46c..1d9fbe6a 100644
--- a/cc/tiles/image_controller_unittest.cc
+++ b/cc/tiles/image_controller_unittest.cc
@@ -240,7 +240,7 @@
~ImageControllerTest() override = default;
void SetUp() override {
- worker_task_runner_ = make_scoped_refptr(new WorkerTaskRunner);
+ worker_task_runner_ = base::MakeRefCounted<WorkerTaskRunner>();
controller_.reset(
new ImageController(task_runner_.get(), worker_task_runner_));
cache_ = TestableCache();
diff --git a/cc/tiles/tile_manager.cc b/cc/tiles/tile_manager.cc
index 21c016b..2bc4f83 100644
--- a/cc/tiles/tile_manager.cc
+++ b/cc/tiles/tile_manager.cc
@@ -1192,11 +1192,11 @@
std::move(image_id_to_current_frame_index));
}
- return make_scoped_refptr(new RasterTaskImpl(
+ return base::MakeRefCounted<RasterTaskImpl>(
this, tile, resource, prioritized_tile.raster_source(), playback_settings,
prioritized_tile.priority().resolution, invalidated_rect,
prepare_tiles_count_, std::move(raster_buffer), &decode_tasks,
- use_gpu_rasterization_, std::move(image_provider)));
+ use_gpu_rasterization_, std::move(image_provider));
}
void TileManager::ResetSignalsForTesting() {
@@ -1596,9 +1596,9 @@
// posts |callback| to |task_runner| when run.
scoped_refptr<TileTask> TileManager::CreateTaskSetFinishedTask(
void (TileManager::*callback)()) {
- return make_scoped_refptr(new TaskSetFinishedTaskImpl(
+ return base::MakeRefCounted<TaskSetFinishedTaskImpl>(
task_runner_,
- base::Bind(callback, task_set_finished_weak_ptr_factory_.GetWeakPtr())));
+ base::Bind(callback, task_set_finished_weak_ptr_factory_.GetWeakPtr()));
}
std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc
index 71cf49c1..fb484ea8 100644
--- a/cc/tiles/tile_manager_unittest.cc
+++ b/cc/tiles/tile_manager_unittest.cc
@@ -2337,7 +2337,7 @@
const LayerTreeSettings& settings,
TaskRunnerProvider* task_runner_provider,
TaskGraphRunner* task_graph_runner) override {
- task_runner_ = make_scoped_refptr(new SynchronousSimpleTaskRunner);
+ task_runner_ = base::MakeRefCounted<SynchronousSimpleTaskRunner>();
return std::make_unique<FakeLayerTreeHostImpl>(
settings, task_runner_provider, task_graph_runner, task_runner_);
}
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index 4ebd65ca6..669bb7d 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -8602,9 +8602,9 @@
FakeContentLayerClient client;
client.set_bounds(root->bounds());
scoped_refptr<LayerWithForcedDrawsContent> child =
- make_scoped_refptr(new LayerWithForcedDrawsContent());
+ base::MakeRefCounted<LayerWithForcedDrawsContent>();
scoped_refptr<LayerWithForcedDrawsContent> grandchild =
- make_scoped_refptr(new LayerWithForcedDrawsContent());
+ base::MakeRefCounted<LayerWithForcedDrawsContent>();
scoped_refptr<FakePictureLayer> greatgrandchild(
FakePictureLayer::Create(&client));
@@ -9701,7 +9701,7 @@
TEST_F(LayerTreeHostCommonTest, PropertyTreesRebuildWithOpacityChanges) {
scoped_refptr<Layer> root = Layer::Create();
scoped_refptr<LayerWithForcedDrawsContent> child =
- make_scoped_refptr(new LayerWithForcedDrawsContent());
+ base::MakeRefCounted<LayerWithForcedDrawsContent>();
root->AddChild(child);
host()->SetRootLayer(root);
@@ -9743,7 +9743,7 @@
TEST_F(LayerTreeHostCommonTest, OpacityAnimationsTrackingTest) {
scoped_refptr<Layer> root = Layer::Create();
scoped_refptr<LayerWithForcedDrawsContent> animated =
- make_scoped_refptr(new LayerWithForcedDrawsContent());
+ base::MakeRefCounted<LayerWithForcedDrawsContent>();
root->AddChild(animated);
host()->SetRootLayer(root);
host()->SetElementIdsForTesting();
@@ -9791,7 +9791,7 @@
TEST_F(LayerTreeHostCommonTest, TransformAnimationsTrackingTest) {
scoped_refptr<Layer> root = Layer::Create();
scoped_refptr<LayerWithForcedDrawsContent> animated =
- make_scoped_refptr(new LayerWithForcedDrawsContent());
+ base::MakeRefCounted<LayerWithForcedDrawsContent>();
root->AddChild(animated);
host()->SetRootLayer(root);
host()->SetElementIdsForTesting();
diff --git a/cc/trees/layer_tree_host_pixeltest_masks.cc b/cc/trees/layer_tree_host_pixeltest_masks.cc
index ee78966..fa38e57 100644
--- a/cc/trees/layer_tree_host_pixeltest_masks.cc
+++ b/cc/trees/layer_tree_host_pixeltest_masks.cc
@@ -40,7 +40,7 @@
scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
PaintingControlSetting picture_control) override {
- auto display_list = make_scoped_refptr(new DisplayItemList);
+ auto display_list = base::MakeRefCounted<DisplayItemList>();
display_list->StartPaint();
display_list->push<SaveOp>();
@@ -186,7 +186,7 @@
gfx::Rect PaintableRegion() override { return gfx::Rect(bounds_); }
scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
PaintingControlSetting picture_control) override {
- auto display_list = make_scoped_refptr(new DisplayItemList);
+ auto display_list = base::MakeRefCounted<DisplayItemList>();
display_list->StartPaint();
display_list->push<SaveOp>();
@@ -235,7 +235,7 @@
gfx::Rect PaintableRegion() override { return gfx::Rect(bounds_); }
scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
PaintingControlSetting picture_control) override {
- auto display_list = make_scoped_refptr(new DisplayItemList);
+ auto display_list = base::MakeRefCounted<DisplayItemList>();
display_list->StartPaint();
display_list->push<SaveOp>();
diff --git a/cc/trees/layer_tree_host_pixeltest_tiles.cc b/cc/trees/layer_tree_host_pixeltest_tiles.cc
index 64ad181..0c903a60 100644
--- a/cc/trees/layer_tree_host_pixeltest_tiles.cc
+++ b/cc/trees/layer_tree_host_pixeltest_tiles.cc
@@ -107,7 +107,7 @@
gfx::Rect PaintableRegion() override { return gfx::Rect(size_); }
scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
PaintingControlSetting painting_status) override {
- auto display_list = make_scoped_refptr(new DisplayItemList);
+ auto display_list = base::MakeRefCounted<DisplayItemList>();
display_list->StartPaint();
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index c1ab7fdd2..ff56d51 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -1687,9 +1687,9 @@
void SetupTree() override {
scoped_refptr<Layer> root = Layer::Create();
root->SetBounds(gfx::Size(10, 10));
- child_layer_ = make_scoped_refptr(new UpdateCountingLayer);
+ child_layer_ = base::MakeRefCounted<UpdateCountingLayer>();
child_layer_->SetBounds(gfx::Size(10, 10));
- mask_layer_ = make_scoped_refptr(new UpdateCountingLayer);
+ mask_layer_ = base::MakeRefCounted<UpdateCountingLayer>();
mask_layer_->SetBounds(gfx::Size(10, 10));
child_layer_->SetMaskLayer(mask_layer_.get());
root->AddChild(child_layer_);
diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc
index 8b0a9c6..22a2b8f 100644
--- a/chrome/browser/background/background_contents_service.cc
+++ b/chrome/browser/background/background_contents_service.cc
@@ -205,7 +205,7 @@
extension, resource, gfx::Size(size, size),
base::Bind(
&NotificationImageReady, extension->name(), extension->id(), message,
- make_scoped_refptr(new CrashNotificationDelegate(profile, extension)),
+ base::MakeRefCounted<CrashNotificationDelegate>(profile, extension),
profile));
}
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
index b31a230..14f5d590f 100644
--- 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
@@ -153,7 +153,7 @@
// Pipe is not seekable. Just consume the contents.
const size_t kTemporaryBufferSize = 1024 * 1024;
auto temporary_buffer =
- make_scoped_refptr(new net::IOBufferWithSize(kTemporaryBufferSize));
+ base::MakeRefCounted<net::IOBufferWithSize>(kTemporaryBufferSize);
ConsumeFileContents(buf, buffer_length, callback, temporary_buffer,
offset_);
break;
diff --git a/chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc b/chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc
index a94e55c..36bceac0 100644
--- a/chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc
+++ b/chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc
@@ -44,7 +44,7 @@
bool ReadData(ArcContentFileSystemFileStreamReader* reader,
net::IOBufferWithSize* buffer) {
auto drainable_buffer =
- make_scoped_refptr(new net::DrainableIOBuffer(buffer, buffer->size()));
+ base::MakeRefCounted<net::DrainableIOBuffer>(buffer, buffer->size());
while (drainable_buffer->BytesRemaining()) {
net::TestCompletionCallback callback;
int result = callback.GetResult(
@@ -102,7 +102,7 @@
TEST_F(ArcContentFileSystemFileStreamReaderTest, ReadRegularFile) {
ArcContentFileSystemFileStreamReader reader(GURL(kArcUrlFile), 0);
- auto buffer = make_scoped_refptr(new net::IOBufferWithSize(strlen(kData)));
+ auto buffer = base::MakeRefCounted<net::IOBufferWithSize>(strlen(kData));
EXPECT_TRUE(ReadData(&reader, buffer.get()));
EXPECT_EQ(base::StringPiece(kData, strlen(kData)),
base::StringPiece(buffer->data(), buffer->size()));
@@ -112,7 +112,7 @@
constexpr size_t kOffset = 10;
ArcContentFileSystemFileStreamReader reader(GURL(kArcUrlFile), kOffset);
auto buffer =
- make_scoped_refptr(new net::IOBufferWithSize(strlen(kData) - kOffset));
+ base::MakeRefCounted<net::IOBufferWithSize>(strlen(kData) - kOffset);
EXPECT_TRUE(ReadData(&reader, buffer.get()));
EXPECT_EQ(base::StringPiece(kData + kOffset, strlen(kData) - kOffset),
base::StringPiece(buffer->data(), buffer->size()));
@@ -120,7 +120,7 @@
TEST_F(ArcContentFileSystemFileStreamReaderTest, ReadPipe) {
ArcContentFileSystemFileStreamReader reader(GURL(kArcUrlPipe), 0);
- auto buffer = make_scoped_refptr(new net::IOBufferWithSize(strlen(kData)));
+ auto buffer = base::MakeRefCounted<net::IOBufferWithSize>(strlen(kData));
EXPECT_TRUE(ReadData(&reader, buffer.get()));
EXPECT_EQ(base::StringPiece(kData, strlen(kData)),
base::StringPiece(buffer->data(), buffer->size()));
@@ -130,7 +130,7 @@
constexpr size_t kOffset = 10;
ArcContentFileSystemFileStreamReader reader(GURL(kArcUrlPipe), kOffset);
auto buffer =
- make_scoped_refptr(new net::IOBufferWithSize(strlen(kData) - kOffset));
+ base::MakeRefCounted<net::IOBufferWithSize>(strlen(kData) - kOffset);
EXPECT_TRUE(ReadData(&reader, buffer.get()));
EXPECT_EQ(base::StringPiece(kData + kOffset, strlen(kData) - kOffset),
base::StringPiece(buffer->data(), buffer->size()));
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc
index 89f6c8b..c0d6ee7 100644
--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -567,8 +567,8 @@
// Once the notification is removed, the specified resolution will be stored
// by SetDisplayMode.
ash::Shell::Get()->display_manager()->SetDisplayMode(
- id, make_scoped_refptr(new display::ManagedDisplayMode(
- gfx::Size(300, 200), 60.0f, false, true)));
+ id, base::MakeRefCounted<display::ManagedDisplayMode>(
+ gfx::Size(300, 200), 60.0f, false, true));
UpdateDisplay("300x200#500x400|400x300|300x200");
property = nullptr;
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc
index dce5438b..19ab06a 100644
--- a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc
@@ -102,9 +102,9 @@
void SetUp() override {
short_text_buffer_ =
- make_scoped_refptr(new net::StringIOBuffer(kShortTextToWrite));
+ base::MakeRefCounted<net::StringIOBuffer>(kShortTextToWrite);
long_text_buffer_ =
- make_scoped_refptr(new net::StringIOBuffer(kLongTextToWrite));
+ base::MakeRefCounted<net::StringIOBuffer>(kLongTextToWrite);
ASSERT_LT(short_text_buffer_->size(), long_text_buffer_->size());
}
diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc
index ef512f2f..ab154ce0 100644
--- a/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc
@@ -83,7 +83,7 @@
kExtensionId, MountOptions(kFileSystemId, "" /* display_name */),
base::FilePath(), false /* configurable */, true /* watchable */,
extensions::SOURCE_FILE);
- io_buffer_ = make_scoped_refptr(new net::IOBuffer(kOffset + kLength));
+ io_buffer_ = base::MakeRefCounted<net::IOBuffer>(kOffset + kLength);
}
ProvidedFileSystemInfo file_system_info_;
diff --git a/chrome/browser/chromeos/file_system_provider/operations/write_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/write_file_unittest.cc
index c78093eb..080bc10e 100644
--- a/chrome/browser/chromeos/file_system_provider/operations/write_file_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/operations/write_file_unittest.cc
@@ -47,7 +47,7 @@
file_system_info_ = ProvidedFileSystemInfo(
kExtensionId, mount_options, base::FilePath(), false /* configurable */,
true /* watchable */, extensions::SOURCE_FILE);
- io_buffer_ = make_scoped_refptr(new net::StringIOBuffer(kWriteData));
+ io_buffer_ = base::MakeRefCounted<net::StringIOBuffer>(kWriteData);
}
ProvidedFileSystemInfo file_system_info_;
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 242af265..0e5cc935 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -1012,7 +1012,7 @@
void SetUpOnMainThread() override {
PrefServiceFactory factory;
- factory.set_user_prefs(make_scoped_refptr(new PrefStoreStub()));
+ factory.set_user_prefs(base::MakeRefCounted<PrefStoreStub>());
local_state_ = factory.Create(new PrefRegistrySimple());
WizardController::set_local_state_for_testing(local_state_.get());
diff --git a/chrome/browser/chromeos/tether/tether_service_unittest.cc b/chrome/browser/chromeos/tether/tether_service_unittest.cc
index 51423d6..e5bb74e 100644
--- a/chrome/browser/chromeos/tether/tether_service_unittest.cc
+++ b/chrome/browser/chromeos/tether/tether_service_unittest.cc
@@ -213,7 +213,7 @@
mock_cryptauth_device_manager_.get());
mock_adapter_ =
- make_scoped_refptr(new NiceMock<MockExtendedBluetoothAdapter>());
+ base::MakeRefCounted<NiceMock<MockExtendedBluetoothAdapter>>();
SetIsBluetoothPowered(true);
is_adapter_present_ = true;
ON_CALL(*mock_adapter_, IsPresent())
diff --git a/chrome/browser/component_updater/chrome_component_updater_configurator.cc b/chrome/browser/component_updater/chrome_component_updater_configurator.cc
index 43204b1..02b83a6 100644
--- a/chrome/browser/component_updater/chrome_component_updater_configurator.cc
+++ b/chrome/browser/component_updater/chrome_component_updater_configurator.cc
@@ -161,7 +161,7 @@
scoped_refptr<update_client::OutOfProcessPatcher>
ChromeConfigurator::CreateOutOfProcessPatcher() const {
- return make_scoped_refptr(new ChromeOutOfProcessPatcher);
+ return base::MakeRefCounted<ChromeOutOfProcessPatcher>();
}
bool ChromeConfigurator::EnabledDeltas() const {
diff --git a/chrome/browser/extensions/api/image_writer_private/operation.cc b/chrome/browser/extensions/api/image_writer_private/operation.cc
index 0fedb395..097cdfa 100644
--- a/chrome/browser/extensions/api/image_writer_private/operation.cc
+++ b/chrome/browser/extensions/api/image_writer_private/operation.cc
@@ -108,11 +108,11 @@
SetStage(image_writer_api::STAGE_UNZIP);
- auto unzip_helper = make_scoped_refptr(new UnzipHelper(
+ auto unzip_helper = base::MakeRefCounted<UnzipHelper>(
task_runner(), base::Bind(&Operation::OnUnzipOpenComplete, this),
base::Bind(&Operation::CompleteAndContinue, this, continuation),
base::Bind(&Operation::OnUnzipFailure, this),
- base::Bind(&Operation::OnUnzipProgress, this)));
+ base::Bind(&Operation::OnUnzipProgress, this));
unzip_helper->Unzip(image_path_, temp_dir_.GetPath());
}
diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
index 9f0d24a..68eda0d 100644
--- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
+++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
@@ -50,7 +50,7 @@
explicit MutablePolicyValueStore(const base::FilePath& path)
: PolicyValueStore(
kTestExtensionId,
- make_scoped_refptr(new SettingsObserverList()),
+ base::MakeRefCounted<SettingsObserverList>(),
base::MakeUnique<LeveldbValueStore>(kDatabaseUMAClientName, path)) {
}
~MutablePolicyValueStore() override {}
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index f00f274..17c4ec2 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -410,7 +410,7 @@
ChromeExtensionsBrowserClient::CreateUpdateClient(
content::BrowserContext* context) {
return update_client::UpdateClientFactory(
- make_scoped_refptr(new ChromeUpdateClientConfig(context)));
+ base::MakeRefCounted<ChromeUpdateClientConfig>(context));
}
std::unique_ptr<ExtensionApiFrameIdMapHelper>
diff --git a/chrome/browser/extensions/external_registry_loader_win_unittest.cc b/chrome/browser/extensions/external_registry_loader_win_unittest.cc
index bf9ba21d..6c11456 100644
--- a/chrome/browser/extensions/external_registry_loader_win_unittest.cc
+++ b/chrome/browser/extensions/external_registry_loader_win_unittest.cc
@@ -86,7 +86,7 @@
// Regression test for https://crbug.com/653045.
TEST_F(ExternalRegistryLoaderUnittest, TwoStartLoadingDoesNotCrash) {
scoped_refptr<TestExternalRegistryLoader> test_loader =
- make_scoped_refptr(new TestExternalRegistryLoader());
+ base::MakeRefCounted<TestExternalRegistryLoader>();
test_loader->StartLoading();
test_loader->StartLoading();
@@ -103,7 +103,7 @@
// could overwrite the first one's prefs.
TEST_F(ExternalRegistryLoaderUnittest, TwoStartLoadingDoesNotOverwritePrefs) {
scoped_refptr<TestExternalRegistryLoader> test_loader =
- make_scoped_refptr(new TestExternalRegistryLoader());
+ base::MakeRefCounted<TestExternalRegistryLoader>();
test_loader->StartLoading();
test_loader->StartLoading();
diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/chrome/browser/extensions/updater/chrome_update_client_config.cc
index 60a719d..5e9a0553 100644
--- a/chrome/browser/extensions/updater/chrome_update_client_config.cc
+++ b/chrome/browser/extensions/updater/chrome_update_client_config.cc
@@ -156,7 +156,7 @@
scoped_refptr<update_client::OutOfProcessPatcher>
ChromeUpdateClientConfig::CreateOutOfProcessPatcher() const {
- return make_scoped_refptr(new component_updater::ChromeOutOfProcessPatcher);
+ return base::MakeRefCounted<component_updater::ChromeOutOfProcessPatcher>();
}
bool ChromeUpdateClientConfig::EnabledDeltas() const {
diff --git a/chrome/browser/local_discovery/service_discovery_shared_client.cc b/chrome/browser/local_discovery/service_discovery_shared_client.cc
index 6179a7c..ff6fce6 100644
--- a/chrome/browser/local_discovery/service_discovery_shared_client.cc
+++ b/chrome/browser/local_discovery/service_discovery_shared_client.cc
@@ -89,7 +89,7 @@
#if defined(OS_MACOSX)
return ServiceDiscoveryClientMacFactory::CreateInstance();
#else
- return make_scoped_refptr(new ServiceDiscoveryClientMdns());
+ return base::MakeRefCounted<ServiceDiscoveryClientMdns>();
#endif // defined(OS_MACOSX)
#else
NOTIMPLEMENTED();
diff --git a/chrome/browser/notifications/notification_platform_bridge_linux.cc b/chrome/browser/notifications/notification_platform_bridge_linux.cc
index 27e0981..970e721 100644
--- a/chrome/browser/notifications/notification_platform_bridge_linux.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_linux.cc
@@ -409,7 +409,7 @@
bus_options.bus_type = dbus::Bus::SESSION;
bus_options.connection_type = dbus::Bus::PRIVATE;
bus_options.dbus_task_runner = task_runner_;
- bus_ = make_scoped_refptr(new dbus::Bus(bus_options));
+ bus_ = base::MakeRefCounted<dbus::Bus>(bus_options);
}
notification_proxy_ =
diff --git a/chrome/browser/predictors/loading_test_util.cc b/chrome/browser/predictors/loading_test_util.cc
index cb39b43..9850d00 100644
--- a/chrome/browser/predictors/loading_test_util.cc
+++ b/chrome/browser/predictors/loading_test_util.cc
@@ -215,8 +215,8 @@
scoped_refptr<net::HttpResponseHeaders> MakeResponseHeaders(
const char* headers) {
- return make_scoped_refptr(new net::HttpResponseHeaders(
- net::HttpUtil::AssembleRawHeaders(headers, strlen(headers))));
+ return base::MakeRefCounted<net::HttpResponseHeaders>(
+ net::HttpUtil::AssembleRawHeaders(headers, strlen(headers)));
}
MockURLRequestJob::MockURLRequestJob(
diff --git a/chrome/browser/supervised_user/supervised_user_browsertest.cc b/chrome/browser/supervised_user/supervised_user_browsertest.cc
index 64357d6..2f47eec 100644
--- a/chrome/browser/supervised_user/supervised_user_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_browsertest.cc
@@ -411,7 +411,7 @@
SupervisedUserSettingsService* supervised_user_settings_service =
SupervisedUserSettingsServiceFactory::GetForProfile(
browser()->profile());
- auto message_loop_runner = make_scoped_refptr(new content::MessageLoopRunner);
+ auto message_loop_runner = base::MakeRefCounted<content::MessageLoopRunner>();
InterstitialPageObserver interstitial_observer(
web_contents, message_loop_runner->QuitClosure());
supervised_user_settings_service->SetLocalSetting(
diff --git a/chrome/browser/ui/app_list/app_list_service_unittest.cc b/chrome/browser/ui/app_list/app_list_service_unittest.cc
index 7788f967..753f9df 100644
--- a/chrome/browser/ui/app_list/app_list_service_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_unittest.cc
@@ -101,7 +101,7 @@
profiles::RegisterPrefs(pref_registry);
PrefServiceFactory factory;
- factory.set_user_prefs(make_scoped_refptr(new TestingPrefStore));
+ factory.set_user_prefs(base::MakeRefCounted<TestingPrefStore>());
local_state_ = factory.Create(pref_registry);
profile_store_ = new FakeProfileStore(user_data_dir_, local_state_.get());
diff --git a/chrome/browser/ui/startup/default_browser_infobar_delegate.cc b/chrome/browser/ui/startup/default_browser_infobar_delegate.cc
index b626427..6b32c67 100644
--- a/chrome/browser/ui/startup/default_browser_infobar_delegate.cc
+++ b/chrome/browser/ui/startup/default_browser_infobar_delegate.cc
@@ -115,8 +115,8 @@
// The worker pointer is reference counted. While it is running, the
// message loops of the FILE and UI thread will hold references to it
// and it will be automatically freed once all its tasks have finished.
- make_scoped_refptr(new shell_integration::DefaultBrowserWorker(
- shell_integration::DefaultWebClientWorkerCallback()))
+ base::MakeRefCounted<shell_integration::DefaultBrowserWorker>(
+ shell_integration::DefaultWebClientWorkerCallback())
->StartSetAsDefault();
return true;
}
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index f50f67d..998a550e 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -789,7 +789,7 @@
SupervisedUserSettingsService* supervised_user_settings =
SupervisedUserSettingsServiceFactory::GetForProfile(this);
scoped_refptr<PrefStore> supervised_user_prefs =
- make_scoped_refptr(new SupervisedUserPrefStore(supervised_user_settings));
+ base::MakeRefCounted<SupervisedUserPrefStore>(supervised_user_settings);
factory.set_supervised_user_prefs(supervised_user_prefs);
diff --git a/chromeos/binder/transaction_data_reader.cc b/chromeos/binder/transaction_data_reader.cc
index 5788eee..b4c7344 100644
--- a/chromeos/binder/transaction_data_reader.cc
+++ b/chromeos/binder/transaction_data_reader.cc
@@ -120,7 +120,7 @@
}
switch (obj.type) {
case BINDER_TYPE_HANDLE:
- return make_scoped_refptr(new RemoteObject(command_broker, obj.handle));
+ return base::MakeRefCounted<RemoteObject>(command_broker, obj.handle);
case BINDER_TYPE_BINDER:
return make_scoped_refptr(reinterpret_cast<LocalObject*>(obj.cookie));
}
diff --git a/chromeos/components/tether/ble_advertisement_synchronizer_unittest.cc b/chromeos/components/tether/ble_advertisement_synchronizer_unittest.cc
index b6535e4..93276883 100644
--- a/chromeos/components/tether/ble_advertisement_synchronizer_unittest.cc
+++ b/chromeos/components/tether/ble_advertisement_synchronizer_unittest.cc
@@ -128,9 +128,9 @@
class BleAdvertisementSynchronizerTest : public testing::Test {
protected:
BleAdvertisementSynchronizerTest()
- : fake_advertisement_(make_scoped_refptr(new FakeBluetoothAdvertisement(
+ : fake_advertisement_(base::MakeRefCounted<FakeBluetoothAdvertisement>(
base::Bind(&BleAdvertisementSynchronizerTest::OnUnregisterCalled,
- base::Unretained(this))))) {}
+ base::Unretained(this)))) {}
void SetUp() override {
num_register_success_ = 0;
diff --git a/chromeos/components/tether/ble_advertiser_unittest.cc b/chromeos/components/tether/ble_advertiser_unittest.cc
index cda1bf1..ce57bf1 100644
--- a/chromeos/components/tether/ble_advertiser_unittest.cc
+++ b/chromeos/components/tether/ble_advertiser_unittest.cc
@@ -125,7 +125,7 @@
void SetUp() override {
mock_adapter_ =
- make_scoped_refptr(new StrictMock<device::MockBluetoothAdapter>());
+ base::MakeRefCounted<StrictMock<device::MockBluetoothAdapter>>();
std::unique_ptr<cryptauth::MockForegroundEidGenerator> eid_generator =
base::MakeUnique<cryptauth::MockForegroundEidGenerator>();
diff --git a/chromeos/components/tether/ble_connection_manager_unittest.cc b/chromeos/components/tether/ble_connection_manager_unittest.cc
index f063d66..de6fff2 100644
--- a/chromeos/components/tether/ble_connection_manager_unittest.cc
+++ b/chromeos/components/tether/ble_connection_manager_unittest.cc
@@ -289,7 +289,7 @@
fake_cryptauth_service_ =
base::MakeUnique<cryptauth::FakeCryptAuthService>();
mock_adapter_ =
- make_scoped_refptr(new NiceMock<device::MockBluetoothAdapter>());
+ base::MakeRefCounted<NiceMock<device::MockBluetoothAdapter>>();
device_queue_ = base::MakeUnique<BleAdvertisementDeviceQueue>();
diff --git a/chromeos/components/tether/ble_scanner_unittest.cc b/chromeos/components/tether/ble_scanner_unittest.cc
index 88bffc8..0d56e20 100644
--- a/chromeos/components/tether/ble_scanner_unittest.cc
+++ b/chromeos/components/tether/ble_scanner_unittest.cc
@@ -85,23 +85,23 @@
const size_t kMinNumBytesInServiceData = 4;
-const std::string kDefaultBluetoothAddress = "11:22:33:44:55:66";
+const char kDefaultBluetoothAddress[] = "11:22:33:44:55:66";
-const std::string fake_local_public_key = "fakeLocalPublicKey";
+const char fake_local_public_key[] = "fakeLocalPublicKey";
-const std::string current_eid_data = "currentEidData";
+const char current_eid_data[] = "currentEidData";
const int64_t current_eid_start_ms = 1000L;
const int64_t current_eid_end_ms = 2000L;
-const std::string adjacent_eid_data = "adjacentEidData";
+const char adjacent_eid_data[] = "adjacentEidData";
const int64_t adjacent_eid_start_ms = 2000L;
const int64_t adjacent_eid_end_ms = 3000L;
-const std::string fake_beacon_seed1_data = "fakeBeaconSeed1Data";
+const char fake_beacon_seed1_data[] = "fakeBeaconSeed1Data";
const int64_t fake_beacon_seed1_start_ms = current_eid_start_ms;
const int64_t fake_beacon_seed1_end_ms = current_eid_end_ms;
-const std::string fake_beacon_seed2_data = "fakeBeaconSeed2Data";
+const char fake_beacon_seed2_data[] = "fakeBeaconSeed2Data";
const int64_t fake_beacon_seed2_start_ms = adjacent_eid_start_ms;
const int64_t fake_beacon_seed2_end_ms = adjacent_eid_end_ms;
@@ -178,7 +178,7 @@
last_discovery_error_callback_.Reset();
mock_adapter_ =
- make_scoped_refptr(new NiceMock<device::MockBluetoothAdapter>());
+ base::MakeRefCounted<NiceMock<device::MockBluetoothAdapter>>();
ON_CALL(*mock_adapter_, StartDiscoverySession(_, _))
.WillByDefault(
Invoke(this, &BleScannerTest::SaveStartDiscoverySessionArgs));
diff --git a/chromeos/components/tether/initializer_impl_unittest.cc b/chromeos/components/tether/initializer_impl_unittest.cc
index a8045dc..5db593dc 100644
--- a/chromeos/components/tether/initializer_impl_unittest.cc
+++ b/chromeos/components/tether/initializer_impl_unittest.cc
@@ -202,7 +202,7 @@
base::MakeUnique<TestNetworkConnectionHandler>();
scoped_refptr<NiceMock<device::MockBluetoothAdapter>> mock_adapter =
- make_scoped_refptr(new NiceMock<device::MockBluetoothAdapter>());
+ base::MakeRefCounted<NiceMock<device::MockBluetoothAdapter>>();
// Call an instance method of the test instead of initializing and destroying
// here because the friend relationship between Initializer and
diff --git a/chromeos/login/auth/extended_authenticator.cc b/chromeos/login/auth/extended_authenticator.cc
index cd5a3f2..31ce974e 100644
--- a/chromeos/login/auth/extended_authenticator.cc
+++ b/chromeos/login/auth/extended_authenticator.cc
@@ -11,13 +11,13 @@
// static
scoped_refptr<ExtendedAuthenticator> ExtendedAuthenticator::Create(
NewAuthStatusConsumer* consumer) {
- return make_scoped_refptr(new ExtendedAuthenticatorImpl(consumer));
+ return base::MakeRefCounted<ExtendedAuthenticatorImpl>(consumer);
}
// static
scoped_refptr<ExtendedAuthenticator> ExtendedAuthenticator::Create(
AuthStatusConsumer* consumer) {
- return make_scoped_refptr(new ExtendedAuthenticatorImpl(consumer));
+ return base::MakeRefCounted<ExtendedAuthenticatorImpl>(consumer);
}
ExtendedAuthenticator::ExtendedAuthenticator() {
diff --git a/components/autofill/core/browser/autofill_test_utils.cc b/components/autofill/core/browser/autofill_test_utils.cc
index 303b143..e0543b1ea 100644
--- a/components/autofill/core/browser/autofill_test_utils.cc
+++ b/components/autofill/core/browser/autofill_test_utils.cc
@@ -79,7 +79,7 @@
registry->RegisterInt64Pref(AccountFetcherService::kLastUpdatePref, 0);
PrefServiceFactory factory;
- factory.set_user_prefs(make_scoped_refptr(new TestingPrefStore()));
+ factory.set_user_prefs(base::MakeRefCounted<TestingPrefStore>());
return factory.Create(registry);
}
diff --git a/components/cryptauth/ble/bluetooth_low_energy_weave_client_connection_unittest.cc b/components/cryptauth/ble/bluetooth_low_energy_weave_client_connection_unittest.cc
index c8a0092..3429316 100644
--- a/components/cryptauth/ble/bluetooth_low_energy_weave_client_connection_unittest.cc
+++ b/components/cryptauth/ble/bluetooth_low_energy_weave_client_connection_unittest.cc
@@ -333,8 +333,8 @@
generator_ = nullptr;
receiver_ = nullptr;
- adapter_ = make_scoped_refptr(new NiceMock<device::MockBluetoothAdapter>());
- task_runner_ = make_scoped_refptr(new base::TestSimpleTaskRunner());
+ adapter_ = base::MakeRefCounted<NiceMock<device::MockBluetoothAdapter>>();
+ task_runner_ = base::MakeRefCounted<base::TestSimpleTaskRunner>();
mock_bluetooth_device_ =
base::MakeUnique<NiceMock<device::MockBluetoothDevice>>(
diff --git a/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc b/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc
index b1c516e..a72b8bd 100644
--- a/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc
+++ b/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc
@@ -56,7 +56,7 @@
public:
AffiliationFetcherTest()
: request_context_getter_(new net::TestURLRequestContextGetter(
- make_scoped_refptr(new base::NullTaskRunner))) {}
+ base::MakeRefCounted<base::NullTaskRunner>())) {}
~AffiliationFetcherTest() override {}
diff --git a/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc
index cbe231ed..1e750a8 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc
@@ -99,7 +99,7 @@
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
cache_.reset(
new ResourceCache(temp_dir_.GetPath(),
- make_scoped_refptr(new base::TestSimpleTaskRunner)));
+ base::MakeRefCounted<base::TestSimpleTaskRunner>()));
store_.reset(new ComponentCloudPolicyStore(&store_delegate_, cache_.get()));
store_->SetCredentials(ComponentPolicyBuilder::kFakeUsername,
ComponentPolicyBuilder::kFakeToken,
diff --git a/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc b/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc
index 35c31ef..8ac0e96b 100644
--- a/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc
+++ b/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc
@@ -25,7 +25,7 @@
class PolicyHeaderIOHelperTest : public testing::Test {
public:
PolicyHeaderIOHelperTest() {
- task_runner_ = make_scoped_refptr(new base::TestSimpleTaskRunner());
+ task_runner_ = base::MakeRefCounted<base::TestSimpleTaskRunner>();
}
~PolicyHeaderIOHelperTest() override {}
diff --git a/components/policy/core/common/cloud/policy_header_service_unittest.cc b/components/policy/core/common/cloud/policy_header_service_unittest.cc
index a4c0073..71251c71 100644
--- a/components/policy/core/common/cloud/policy_header_service_unittest.cc
+++ b/components/policy/core/common/cloud/policy_header_service_unittest.cc
@@ -40,7 +40,7 @@
class PolicyHeaderServiceTest : public testing::Test {
public:
PolicyHeaderServiceTest() {
- task_runner_ = make_scoped_refptr(new base::TestSimpleTaskRunner());
+ task_runner_ = base::MakeRefCounted<base::TestSimpleTaskRunner>();
}
~PolicyHeaderServiceTest() override {}
diff --git a/components/policy/core/common/cloud/resource_cache_unittest.cc b/components/policy/core/common/cloud/resource_cache_unittest.cc
index 2da7457..c2a2cc77 100644
--- a/components/policy/core/common/cloud/resource_cache_unittest.cc
+++ b/components/policy/core/common/cloud/resource_cache_unittest.cc
@@ -36,7 +36,7 @@
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
ResourceCache cache(temp_dir.GetPath(),
- make_scoped_refptr(new base::TestSimpleTaskRunner));
+ base::MakeRefCounted<base::TestSimpleTaskRunner>());
// No data initially.
std::string data;
@@ -118,7 +118,7 @@
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
ResourceCache cache(temp_dir.GetPath(),
- make_scoped_refptr(new base::TestSimpleTaskRunner));
+ base::MakeRefCounted<base::TestSimpleTaskRunner>());
// Store some data.
EXPECT_TRUE(cache.Store(kKey1, kSubA, kData0));
diff --git a/components/sync/engine_impl/sync_scheduler_impl_unittest.cc b/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
index 5082dd3a..92a44337 100644
--- a/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
+++ b/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
@@ -122,9 +122,9 @@
extensions_activity_ = new ExtensionsActivity();
workers_.clear();
- workers_.push_back(make_scoped_refptr(new FakeModelWorker(GROUP_UI)));
- workers_.push_back(make_scoped_refptr(new FakeModelWorker(GROUP_DB)));
- workers_.push_back(make_scoped_refptr(new FakeModelWorker(GROUP_PASSIVE)));
+ workers_.push_back(base::MakeRefCounted<FakeModelWorker>(GROUP_UI));
+ workers_.push_back(base::MakeRefCounted<FakeModelWorker>(GROUP_DB));
+ workers_.push_back(base::MakeRefCounted<FakeModelWorker>(GROUP_PASSIVE));
connection_ = std::make_unique<MockConnectionManager>(directory(),
&cancelation_signal_);
diff --git a/components/viz/common/frame_sinks/begin_frame_source_unittest.cc b/components/viz/common/frame_sinks/begin_frame_source_unittest.cc
index 0b64624..9332ccc 100644
--- a/components/viz/common/frame_sinks/begin_frame_source_unittest.cc
+++ b/components/viz/common/frame_sinks/begin_frame_source_unittest.cc
@@ -47,7 +47,7 @@
now_src_.reset(new base::SimpleTestTickClock());
now_src_->Advance(base::TimeDelta::FromMicroseconds(1000));
task_runner_ =
- make_scoped_refptr(new OrderedSimpleTaskRunner(now_src_.get(), false));
+ base::MakeRefCounted<OrderedSimpleTaskRunner>(now_src_.get(), false);
std::unique_ptr<FakeDelayBasedTimeSource> time_source(
new FakeDelayBasedTimeSource(now_src_.get(), task_runner_.get()));
delay_based_time_source_ = time_source.get();
@@ -344,7 +344,7 @@
now_src_.reset(new base::SimpleTestTickClock());
now_src_->Advance(base::TimeDelta::FromMicroseconds(1000));
task_runner_ =
- make_scoped_refptr(new OrderedSimpleTaskRunner(now_src_.get(), false));
+ base::MakeRefCounted<OrderedSimpleTaskRunner>(now_src_.get(), false);
std::unique_ptr<DelayBasedTimeSource> time_source(
new FakeDelayBasedTimeSource(now_src_.get(), task_runner_.get()));
time_source->SetTimebaseAndInterval(
diff --git a/components/viz/common/frame_sinks/delay_based_time_source_unittest.cc b/components/viz/common/frame_sinks/delay_based_time_source_unittest.cc
index be4437d..5cb092b 100644
--- a/components/viz/common/frame_sinks/delay_based_time_source_unittest.cc
+++ b/components/viz/common/frame_sinks/delay_based_time_source_unittest.cc
@@ -22,7 +22,7 @@
protected:
void SetUp() override {
now_src_ = base::MakeUnique<base::SimpleTestTickClock>();
- task_runner_ = make_scoped_refptr(new base::TestSimpleTaskRunner);
+ task_runner_ = base::MakeRefCounted<base::TestSimpleTaskRunner>();
delay_based_time_source_ = base::MakeUnique<FakeDelayBasedTimeSource>(
now_src_.get(), task_runner_.get());
delay_based_time_source_->SetClient(&client_);
diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
index 4aa726e..1549e00 100644
--- a/components/viz/service/display/gl_renderer.cc
+++ b/components/viz/service/display/gl_renderer.cc
@@ -566,7 +566,7 @@
read_lock_fence = current_sync_query_->Begin();
} else {
read_lock_fence =
- make_scoped_refptr(new cc::ResourceProvider::SynchronousFence(gl_));
+ base::MakeRefCounted<cc::ResourceProvider::SynchronousFence>(gl_);
}
resource_provider_->SetReadLockFence(read_lock_fence.get());
diff --git a/components/viz/service/display/skia_renderer.cc b/components/viz/service/display/skia_renderer.cc
index cf678270..048e108 100644
--- a/components/viz/service/display/skia_renderer.cc
+++ b/components/viz/service/display/skia_renderer.cc
@@ -95,8 +95,8 @@
NOTIMPLEMENTED();
} else {
read_lock_fence =
- make_scoped_refptr(new cc::ResourceProvider::SynchronousFence(
- output_surface_->context_provider()->ContextGL()));
+ base::MakeRefCounted<cc::ResourceProvider::SynchronousFence>(
+ output_surface_->context_provider()->ContextGL());
}
resource_provider_->SetReadLockFence(read_lock_fence.get());
diff --git a/content/browser/background_fetch/background_fetch_cross_origin_filter_unittest.cc b/content/browser/background_fetch/background_fetch_cross_origin_filter_unittest.cc
index 5677d67c..980d287 100644
--- a/content/browser/background_fetch/background_fetch_cross_origin_filter_unittest.cc
+++ b/content/browser/background_fetch/background_fetch_cross_origin_filter_unittest.cc
@@ -37,8 +37,8 @@
typename std::map<std::string, std::string>::value_type>
response_headers) {
scoped_refptr<BackgroundFetchRequestInfo> request_info =
- make_scoped_refptr(new BackgroundFetchRequestInfo(
- 0 /* request_info */, ServiceWorkerFetchRequest()));
+ base::MakeRefCounted<BackgroundFetchRequestInfo>(
+ 0 /* request_info */, ServiceWorkerFetchRequest());
request_info->response_headers_ = response_headers;
request_info->url_chain_ = {GURL(response_url)};
diff --git a/content/browser/background_fetch/mock_background_fetch_delegate.cc b/content/browser/background_fetch/mock_background_fetch_delegate.cc
index 29f3a85..21ed689 100644
--- a/content/browser/background_fetch/mock_background_fetch_delegate.cc
+++ b/content/browser/background_fetch/mock_background_fetch_delegate.cc
@@ -22,8 +22,8 @@
int response_code)
: response_(base::MakeUnique<TestResponse>()) {
response_->succeeded_ = (response_code >= 200 && response_code < 300);
- response_->headers = make_scoped_refptr(new net::HttpResponseHeaders(
- "HTTP/1.1 " + std::to_string(response_code)));
+ response_->headers = base::MakeRefCounted<net::HttpResponseHeaders>(
+ "HTTP/1.1 " + std::to_string(response_code));
}
MockBackgroundFetchDelegate::TestResponseBuilder::~TestResponseBuilder() =
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 35ed69c..12393f0 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -168,10 +168,10 @@
constexpr bool automatic_flushes = false;
GURL url("chrome://gpu/GpuProcessTransportFactory::CreateContextCommon");
- return make_scoped_refptr(new ui::ContextProviderCommandBuffer(
+ return base::MakeRefCounted<ui::ContextProviderCommandBuffer>(
std::move(gpu_channel_host), stream_id, stream_priority, surface_handle,
url, automatic_flushes, support_locking, gpu::SharedMemoryLimits(),
- attributes, shared_context_provider, type));
+ attributes, shared_context_provider, type);
}
#if defined(OS_MACOSX)
diff --git a/content/browser/devtools/devtools_url_interceptor_request_job.cc b/content/browser/devtools/devtools_url_interceptor_request_job.cc
index 9afeb06..46c2341 100644
--- a/content/browser/devtools/devtools_url_interceptor_request_job.cc
+++ b/content/browser/devtools/devtools_url_interceptor_request_job.cc
@@ -631,7 +631,7 @@
modifications->modified_url.fromMaybe(redirect_->new_url.spec()));
raw_headers.append(2, '\0');
mock_response_details_.reset(new MockResponseDetails(
- make_scoped_refptr(new net::HttpResponseHeaders(raw_headers)), "", 0,
+ base::MakeRefCounted<net::HttpResponseHeaders>(raw_headers), "", 0,
base::TimeTicks::Now()));
redirect_.reset();
diff --git a/content/browser/download/download_item_impl_unittest.cc b/content/browser/download/download_item_impl_unittest.cc
index 04e24e9..8d00725 100644
--- a/content/browser/download/download_item_impl_unittest.cc
+++ b/content/browser/download/download_item_impl_unittest.cc
@@ -281,8 +281,8 @@
// Creates a new net::HttpResponseHeaders object for the |response_code|.
scoped_refptr<const net::HttpResponseHeaders> CreateResponseHeaders(
int response_code) {
- return make_scoped_refptr(new net::HttpResponseHeaders(
- "HTTP/1.1 " + std::to_string(response_code)));
+ return base::MakeRefCounted<net::HttpResponseHeaders>(
+ "HTTP/1.1 " + std::to_string(response_code));
}
// This class keeps ownership of the created download item; it will
diff --git a/content/browser/fileapi/file_system_operation_runner_unittest.cc b/content/browser/fileapi/file_system_operation_runner_unittest.cc
index e20a4e85..9f654ef 100644
--- a/content/browser/fileapi/file_system_operation_runner_unittest.cc
+++ b/content/browser/fileapi/file_system_operation_runner_unittest.cc
@@ -198,7 +198,7 @@
base::ThreadTaskRunnerHandle::Get().get(),
base::CreateSequencedTaskRunnerWithTraits({base::MayBlock()}).get(),
storage::ExternalMountPoints::CreateRefCounted().get(),
- make_scoped_refptr(new MockSpecialStoragePolicy()).get(), nullptr,
+ base::MakeRefCounted<MockSpecialStoragePolicy>().get(), nullptr,
std::vector<std::unique_ptr<storage::FileSystemBackend>>(),
std::vector<storage::URLRequestAutoMountHandler>(), base_dir,
CreateAllowFileAccessOptions());
diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc b/content/browser/gpu/gpu_ipc_browsertests.cc
index afdc687..b547bd8 100644
--- a/content/browser/gpu/gpu_ipc_browsertests.cc
+++ b/content/browser/gpu/gpu_ipc_browsertests.cc
@@ -38,11 +38,11 @@
attributes.bind_generates_resource = false;
constexpr bool automatic_flushes = false;
constexpr bool support_locking = false;
- return make_scoped_refptr(new ui::ContextProviderCommandBuffer(
+ return base::MakeRefCounted<ui::ContextProviderCommandBuffer>(
std::move(gpu_channel_host), content::kGpuStreamIdDefault,
content::kGpuStreamPriorityDefault, gpu::kNullSurfaceHandle, GURL(),
automatic_flushes, support_locking, gpu::SharedMemoryLimits(), attributes,
- nullptr, ui::command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING));
+ nullptr, ui::command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING);
}
void OnEstablishedGpuChannel(
diff --git a/content/browser/loader/detachable_resource_handler_unittest.cc b/content/browser/loader/detachable_resource_handler_unittest.cc
index 38bf95f0..174ed5f2 100644
--- a/content/browser/loader/detachable_resource_handler_unittest.cc
+++ b/content/browser/loader/detachable_resource_handler_unittest.cc
@@ -155,10 +155,9 @@
}
MaybeSyncDetachAtPhase(DetachPhase::REQUEST_REDIRECTED);
- ASSERT_EQ(
- MockResourceLoader::Status::IDLE,
- mock_loader_->OnRequestRedirected(
- net::RedirectInfo(), make_scoped_refptr(new ResourceResponse())));
+ ASSERT_EQ(MockResourceLoader::Status::IDLE,
+ mock_loader_->OnRequestRedirected(
+ net::RedirectInfo(), base::MakeRefCounted<ResourceResponse>()));
if (!WasDetachedBy(DetachPhase::REQUEST_REDIRECTED)) {
EXPECT_EQ(1, test_handler_->on_request_redirected_called());
EXPECT_EQ(0, test_handler_->on_response_started_called());
@@ -167,7 +166,7 @@
MaybeSyncDetachAtPhase(DetachPhase::ON_RESPONSE_STARTED);
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
if (!WasDetachedBy(DetachPhase::ON_RESPONSE_STARTED)) {
EXPECT_EQ(1, test_handler_->on_request_redirected_called());
EXPECT_EQ(1, test_handler_->on_response_started_called());
@@ -259,14 +258,14 @@
MaybeAsyncDetachAt(DetachPhase::ON_WILL_START);
mock_loader_->OnRequestRedirected(net::RedirectInfo(),
- make_scoped_refptr(new ResourceResponse()));
+ base::MakeRefCounted<ResourceResponse>());
if (test_handler_) {
EXPECT_EQ(1, test_handler_->on_request_redirected_called());
EXPECT_EQ(0, test_handler_->on_response_started_called());
}
MaybeAsyncDetachAt(DetachPhase::REQUEST_REDIRECTED);
- mock_loader_->OnResponseStarted(make_scoped_refptr(new ResourceResponse()));
+ mock_loader_->OnResponseStarted(base::MakeRefCounted<ResourceResponse>());
if (test_handler_) {
EXPECT_EQ(1, test_handler_->on_request_redirected_called());
EXPECT_EQ(1, test_handler_->on_response_started_called());
diff --git a/content/browser/loader/intercepting_resource_handler_unittest.cc b/content/browser/loader/intercepting_resource_handler_unittest.cc
index afc2ec6..302c18a 100644
--- a/content/browser/loader/intercepting_resource_handler_unittest.cc
+++ b/content/browser/loader/intercepting_resource_handler_unittest.cc
@@ -96,7 +96,7 @@
// The response is received. The handler should not change.
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
// The read is replayed by the MimeSniffingResourceHandler. The data should
// have been received by the old intercepting_handler.
@@ -140,7 +140,7 @@
// the download.
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_FALSE(old_handler_status_.is_success());
EXPECT_EQ(net::ERR_ABORTED, old_handler_status_.error());
@@ -198,7 +198,7 @@
// the download.
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
// The old handler should have received the payload.
EXPECT_EQ(kPayload, old_handler_body_);
@@ -257,7 +257,7 @@
// The response is received. The new ResourceHandler should tell us to fail.
ASSERT_EQ(MockResourceLoader::Status::CANCELED,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(net::ERR_ABORTED, mock_loader_->error_code());
}
@@ -285,7 +285,7 @@
// The response is received. The new ResourceHandler should tell us to fail.
ASSERT_EQ(MockResourceLoader::Status::CANCELED,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(net::ERR_ABORTED, mock_loader_->error_code());
}
@@ -315,7 +315,7 @@
// read yet.
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(net::URLRequestStatus::CANCELED, old_handler_status_.status());
EXPECT_EQ(net::ERR_ABORTED, old_handler_status_.error());
@@ -353,7 +353,7 @@
// The response is received.
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(net::URLRequestStatus::CANCELED, old_handler_status_.status());
EXPECT_EQ(net::ERR_ABORTED, old_handler_status_.error());
@@ -434,7 +434,7 @@
// OnReadCompleted method.
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
old_handler_->WaitUntilDeferred();
EXPECT_EQ(1, old_handler_->on_read_completed_called());
@@ -573,7 +573,7 @@
// The response is received.
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(net::URLRequestStatus::SUCCESS, old_handler_status_.status());
EXPECT_FALSE(old_handler_);
@@ -613,7 +613,7 @@
// The response is received.
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(net::URLRequestStatus::IO_PENDING, old_handler_status_.status());
EXPECT_EQ(net::URLRequestStatus::IO_PENDING, new_handler_status.status());
diff --git a/content/browser/loader/mojo_async_resource_handler_unittest.cc b/content/browser/loader/mojo_async_resource_handler_unittest.cc
index 7b3f941..2c16321 100644
--- a/content/browser/loader/mojo_async_resource_handler_unittest.cc
+++ b/content/browser/loader/mojo_async_resource_handler_unittest.cc
@@ -388,7 +388,7 @@
// Returns false if something bad happens.
bool CallOnResponseStarted() {
MockResourceLoader::Status result = mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse()));
+ base::MakeRefCounted<ResourceResponse>());
EXPECT_EQ(MockResourceLoader::Status::IDLE, result);
if (result != MockResourceLoader::Status::IDLE)
return false;
@@ -633,7 +633,7 @@
mock_loader_->OnWillStart(request_->url()));
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
ASSERT_FALSE(url_loader_client_.has_received_response());
url_loader_client_.RunUntilResponseReceived();
@@ -1181,7 +1181,7 @@
redirect_info.status_code = 301;
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->OnRequestRedirected(
- redirect_info, make_scoped_refptr(new ResourceResponse())));
+ redirect_info, base::MakeRefCounted<ResourceResponse>()));
ASSERT_FALSE(url_loader_client_.has_received_response());
ASSERT_FALSE(url_loader_client_.has_received_redirect());
@@ -1201,7 +1201,7 @@
redirect_info.status_code = 302;
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->OnRequestRedirected(
- redirect_info, make_scoped_refptr(new ResourceResponse())));
+ redirect_info, base::MakeRefCounted<ResourceResponse>()));
ASSERT_FALSE(url_loader_client_.has_received_response());
ASSERT_FALSE(url_loader_client_.has_received_redirect());
@@ -1219,7 +1219,7 @@
// Give the final response.
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, net::OK);
ASSERT_EQ(MockResourceLoader::Status::IDLE,
@@ -1251,7 +1251,7 @@
mock_loader_->OnWillStart(request_->url()));
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
ASSERT_FALSE(url_loader_client_.has_received_response());
url_loader_client_.RunUntilResponseReceived();
@@ -1303,7 +1303,7 @@
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
ASSERT_FALSE(url_loader_client_.has_received_response());
url_loader_client_.RunUntilResponseReceived();
diff --git a/content/browser/loader/redirect_to_file_resource_handler_unittest.cc b/content/browser/loader/redirect_to_file_resource_handler_unittest.cc
index 8dba0af7..5eac0392 100644
--- a/content/browser/loader/redirect_to_file_resource_handler_unittest.cc
+++ b/content/browser/loader/redirect_to_file_resource_handler_unittest.cc
@@ -332,7 +332,7 @@
// and wait for it to resume the request if running an async test.
MockResourceLoader::Status OnResponseStartedAndWaitForResult()
WARN_UNUSED_RESULT {
- mock_loader_->OnResponseStarted(make_scoped_refptr(new ResourceResponse()));
+ mock_loader_->OnResponseStarted(base::MakeRefCounted<ResourceResponse>());
if (GetParam() == CompletionMode::ASYNC) {
EXPECT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->status());
@@ -417,7 +417,7 @@
mock_loader_->WaitUntilIdleOrCanceled();
}
ASSERT_EQ(MockResourceLoader::Status::IDLE, mock_loader_->status());
- mock_loader_->OnResponseStarted(make_scoped_refptr(new ResourceResponse()));
+ mock_loader_->OnResponseStarted(base::MakeRefCounted<ResourceResponse>());
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->status());
@@ -451,7 +451,7 @@
mock_loader_->WaitUntilIdleOrCanceled();
}
ASSERT_EQ(MockResourceLoader::Status::IDLE, mock_loader_->status());
- mock_loader_->OnResponseStarted(make_scoped_refptr(new ResourceResponse()));
+ mock_loader_->OnResponseStarted(base::MakeRefCounted<ResourceResponse>());
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->status());
diff --git a/content/browser/loader/throttling_resource_handler_unittest.cc b/content/browser/loader/throttling_resource_handler_unittest.cc
index 0db25d3..369fc3d 100644
--- a/content/browser/loader/throttling_resource_handler_unittest.cc
+++ b/content/browser/loader/throttling_resource_handler_unittest.cc
@@ -259,7 +259,7 @@
redirect_info.new_url = GURL(kRedirectUrl);
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnRequestRedirected(
- redirect_info, make_scoped_refptr(new ResourceResponse())));
+ redirect_info, base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(1, throttle1_->will_redirect_request_called());
EXPECT_EQ(0, throttle1_->will_process_response_called());
@@ -270,7 +270,7 @@
ASSERT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(1, throttle1_->will_process_response_called());
EXPECT_EQ(1, throttle2_->will_process_response_called());
@@ -311,7 +311,7 @@
redirect_info.new_url = GURL(kRedirectUrl);
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->OnRequestRedirected(
- redirect_info, make_scoped_refptr(new ResourceResponse())));
+ redirect_info, base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(1, throttle1_->will_redirect_request_called());
EXPECT_EQ(0, throttle2_->will_redirect_request_called());
@@ -328,7 +328,7 @@
EXPECT_EQ(0, throttle1_->will_process_response_called());
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(1, throttle1_->will_process_response_called());
EXPECT_EQ(0, throttle2_->will_process_response_called());
@@ -482,7 +482,7 @@
redirect_info.new_url = GURL(kRedirectUrl);
ASSERT_EQ(MockResourceLoader::Status::CANCELED,
mock_loader_->OnRequestRedirected(
- redirect_info, make_scoped_refptr(new ResourceResponse())));
+ redirect_info, base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(1, throttle1_->will_redirect_request_called());
EXPECT_EQ(0, throttle2_->will_redirect_request_called());
EXPECT_EQ(0, test_handler_->on_request_redirected_called());
@@ -519,7 +519,7 @@
redirect_info.new_url = GURL(kRedirectUrl);
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->OnRequestRedirected(
- redirect_info, make_scoped_refptr(new ResourceResponse())));
+ redirect_info, base::MakeRefCounted<ResourceResponse>()));
throttle1_->CancelWithError(net::ERR_UNEXPECTED);
EXPECT_EQ(1, throttle1_->will_redirect_request_called());
@@ -564,7 +564,7 @@
redirect_info.new_url = GURL(kRedirectUrl);
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->OnRequestRedirected(
- redirect_info, make_scoped_refptr(new ResourceResponse())));
+ redirect_info, base::MakeRefCounted<ResourceResponse>()));
throttle1_->Resume();
EXPECT_EQ(1, throttle1_->will_redirect_request_called());
@@ -601,7 +601,7 @@
ASSERT_EQ(MockResourceLoader::Status::CANCELED,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(1, throttle1_->will_process_response_called());
EXPECT_EQ(0, throttle2_->will_process_response_called());
EXPECT_EQ(0, test_handler_->on_response_started_called());
@@ -635,7 +635,7 @@
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(1, throttle1_->will_process_response_called());
EXPECT_EQ(0, throttle2_->will_process_response_called());
EXPECT_EQ(0, test_handler_->on_response_started_called());
@@ -680,7 +680,7 @@
ASSERT_EQ(MockResourceLoader::Status::CALLBACK_PENDING,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
EXPECT_EQ(1, throttle1_->will_process_response_called());
EXPECT_EQ(0, throttle2_->will_process_response_called());
EXPECT_EQ(0, test_handler_->on_response_started_called());
@@ -770,7 +770,7 @@
redirect_info.new_url = GURL(kRedirectUrl);
EXPECT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnRequestRedirected(
- redirect_info, make_scoped_refptr(new ResourceResponse())));
+ redirect_info, base::MakeRefCounted<ResourceResponse>()));
throttle1_->CancelWithError(net::ERR_UNEXPECTED);
EXPECT_EQ(MockResourceLoader::Status::CANCELED, mock_loader_->status());
@@ -806,7 +806,7 @@
mock_loader_->OnRequestRedirected(redirect_info, new ResourceResponse()));
EXPECT_EQ(MockResourceLoader::Status::IDLE,
mock_loader_->OnResponseStarted(
- make_scoped_refptr(new ResourceResponse())));
+ base::MakeRefCounted<ResourceResponse>()));
throttle1_->CancelWithError(net::ERR_UNEXPECTED);
EXPECT_EQ(MockResourceLoader::Status::CANCELED, mock_loader_->status());
diff --git a/content/browser/service_worker/foreign_fetch_request_handler_unittest.cc b/content/browser/service_worker/foreign_fetch_request_handler_unittest.cc
index 7d1f246..cad3616 100644
--- a/content/browser/service_worker/foreign_fetch_request_handler_unittest.cc
+++ b/content/browser/service_worker/foreign_fetch_request_handler_unittest.cc
@@ -145,7 +145,7 @@
http_info->ssl_info.security_bits = 0x100;
// SSL3 TLS_DHE_RSA_WITH_AES_256_CBC_SHA
http_info->ssl_info.connection_status = 0x300039;
- http_info->headers = make_scoped_refptr(new net::HttpResponseHeaders(""));
+ http_info->headers = base::MakeRefCounted<net::HttpResponseHeaders>("");
return http_info;
}
diff --git a/content/browser/service_worker/service_worker_storage_unittest.cc b/content/browser/service_worker/service_worker_storage_unittest.cc
index 0d134d4..4df07c5 100644
--- a/content/browser/service_worker/service_worker_storage_unittest.cc
+++ b/content/browser/service_worker/service_worker_storage_unittest.cc
@@ -1968,7 +1968,7 @@
"AtSAc03z4qvid34W4MHMxyRFUJKlubZ+P5cs5yg6EiBWcagVbnm5uBgJMJN34pag7D5RywGV"
"ol2RFf+4Sdm1hQ4AAABYeyJvcmlnaW4iOiAiaHR0cHM6Ly92YWxpZC5leGFtcGxlLmNvbTo0"
"NDMiLCAiZmVhdHVyZSI6ICJGZWF0dXJlMyIsICJleHBpcnkiOiAxMDAwMDAwMDAwfQ==");
- http_info.headers = make_scoped_refptr(new net::HttpResponseHeaders(""));
+ http_info.headers = base::MakeRefCounted<net::HttpResponseHeaders>("");
http_info.headers->AddHeader(kOriginTrial + kFeature1Token);
http_info.headers->AddHeader(kOriginTrial + kFeature2Token1);
http_info.headers->AddHeader(kOriginTrial + kFeature2Token2);
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
index cbd0ca0..6fe992e 100644
--- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -241,7 +241,7 @@
http_info.ssl_info.security_bits = 0x100;
// SSL3 TLS_DHE_RSA_WITH_AES_256_CBC_SHA
http_info.ssl_info.connection_status = 0x300039;
- http_info.headers = make_scoped_refptr(new net::HttpResponseHeaders(""));
+ http_info.headers = base::MakeRefCounted<net::HttpResponseHeaders>("");
version_->SetMainScriptHttpResponseInfo(http_info);
// Create a controlled client.
diff --git a/content/child/resource_dispatcher.cc b/content/child/resource_dispatcher.cc
index 215a03c..01c61f4 100644
--- a/content/child/resource_dispatcher.cc
+++ b/content/child/resource_dispatcher.cc
@@ -219,8 +219,8 @@
request_info->buffer.reset(
new base::SharedMemory(shm_handle, true)); // read only
request_info->received_data_factory =
- make_scoped_refptr(new SharedMemoryReceivedDataFactory(
- message_sender_, request_id, request_info->buffer));
+ base::MakeRefCounted<SharedMemoryReceivedDataFactory>(
+ message_sender_, request_id, request_info->buffer);
bool ok = request_info->buffer->Map(shm_size);
if (!ok) {
diff --git a/content/child/shared_memory_received_data_factory_unittest.cc b/content/child/shared_memory_received_data_factory_unittest.cc
index d2258a1..f0562b2 100644
--- a/content/child/shared_memory_received_data_factory_unittest.cc
+++ b/content/child/shared_memory_received_data_factory_unittest.cc
@@ -50,8 +50,8 @@
sender_.reset(new StrictMock<MockSender>);
request_id_ = 0xdeadbeaf;
memory_.reset(new base::SharedMemory);
- factory_ = make_scoped_refptr(new SharedMemoryReceivedDataFactory(
- sender_.get(), request_id_, memory_));
+ factory_ = base::MakeRefCounted<SharedMemoryReceivedDataFactory>(
+ sender_.get(), request_id_, memory_);
ASSERT_TRUE(memory_->CreateAndMapAnonymous(memory_size));
ON_CALL(*sender_, SendAck(_)).WillByDefault(Return(true));
diff --git a/content/renderer/categorized_worker_pool.cc b/content/renderer/categorized_worker_pool.cc
index d2f0c81..5a1cfa9 100644
--- a/content/renderer/categorized_worker_pool.cc
+++ b/content/renderer/categorized_worker_pool.cc
@@ -75,7 +75,7 @@
tasks_.erase(tasks_.begin(), tasks_.begin() + completed_tasks_.size());
- tasks_.push_back(make_scoped_refptr(new ClosureTask(std::move(task))));
+ tasks_.push_back(base::MakeRefCounted<ClosureTask>(std::move(task)));
graph_.Reset();
for (const auto& graph_task : tasks_) {
int dependencies = 0;
@@ -204,7 +204,7 @@
});
tasks_.erase(end, tasks_.end());
- tasks_.push_back(make_scoped_refptr(new ClosureTask(std::move(task))));
+ tasks_.push_back(base::MakeRefCounted<ClosureTask>(std::move(task)));
graph_.Reset();
for (const auto& graph_task : tasks_) {
// Delayed tasks are assigned FOREGROUND category, ensuring that they run as
diff --git a/content/renderer/image_capture/image_capture_frame_grabber.cc b/content/renderer/image_capture/image_capture_frame_grabber.cc
index 6467bba..b4134879e 100644
--- a/content/renderer/image_capture/image_capture_frame_grabber.cc
+++ b/content/renderer/image_capture/image_capture_frame_grabber.cc
@@ -139,12 +139,13 @@
// https://crbug.com/623042.
frame_grab_in_progress_ = true;
MediaStreamVideoSink::ConnectToTrack(
- *track, base::Bind(&SingleShotFrameHandler::OnVideoFrameOnIOThread,
- make_scoped_refptr(new SingleShotFrameHandler),
- media::BindToCurrentLoop(
- base::Bind(&ImageCaptureFrameGrabber::OnSkImage,
- weak_factory_.GetWeakPtr(),
- base::Passed(&scoped_callbacks)))),
+ *track,
+ base::Bind(
+ &SingleShotFrameHandler::OnVideoFrameOnIOThread,
+ base::MakeRefCounted<SingleShotFrameHandler>(),
+ media::BindToCurrentLoop(base::Bind(
+ &ImageCaptureFrameGrabber::OnSkImage, weak_factory_.GetWeakPtr(),
+ base::Passed(&scoped_callbacks)))),
false);
}
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 1f51cbf..79d6454 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -394,12 +394,12 @@
attributes.enable_oop_rasterization = support_oop_rasterization;
const bool automatic_flushes = false;
- return make_scoped_refptr(new ui::ContextProviderCommandBuffer(
+ return base::MakeRefCounted<ui::ContextProviderCommandBuffer>(
std::move(gpu_channel_host), stream_id, stream_priority,
gpu::kNullSurfaceHandle,
GURL("chrome://gpu/RenderThreadImpl::CreateOffscreenContext/" +
ui::command_buffer_metrics::ContextTypeToString(type)),
- automatic_flushes, support_locking, limits, attributes, nullptr, type));
+ automatic_flushes, support_locking, limits, attributes, nullptr, type);
}
bool IsRunningInMash() {
@@ -1083,9 +1083,9 @@
mojom::FrameHostInterfaceBrokerPtr frame_host_interface_broker) {
std::pair<PendingFrameCreateMap::iterator, bool> result =
pending_frame_creates_.insert(std::make_pair(
- routing_id, make_scoped_refptr(new PendingFrameCreate(
+ routing_id, base::MakeRefCounted<PendingFrameCreate>(
browser_info, routing_id, std::move(frame_request),
- std::move(frame_host_interface_broker)))));
+ std::move(frame_host_interface_broker))));
CHECK(result.second) << "Inserting a duplicate item.";
}
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc
index c10caff..0c9e7e1e 100644
--- a/content/renderer/render_thread_impl_browsertest.cc
+++ b/content/renderer/render_thread_impl_browsertest.cc
@@ -201,7 +201,7 @@
nullptr, io_task_runner);
mock_process_.reset(new MockRenderProcess);
- test_task_counter_ = make_scoped_refptr(new TestTaskCounter());
+ test_task_counter_ = base::MakeRefCounted<TestTaskCounter>();
// RenderThreadImpl expects the browser to pass these flags.
base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 95cd5fd..f6b0ba2 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -758,7 +758,7 @@
DCHECK(stream);
#if BUILDFLAG(ENABLE_WEBRTC)
return AddAudioTrackToMediaStream(
- make_scoped_refptr(new MockAudioCapturerSource()),
+ base::MakeRefCounted<MockAudioCapturerSource>(),
48000, // sample rate
media::CHANNEL_LAYOUT_STEREO,
480, // sample frames per buffer
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
index 8727d98..8dfbf20e 100644
--- a/content/test/layouttest_support.cc
+++ b/content/test/layouttest_support.cc
@@ -402,14 +402,14 @@
const bool support_locking = false;
auto context_provider =
- make_scoped_refptr(new ui::ContextProviderCommandBuffer(
+ base::MakeRefCounted<ui::ContextProviderCommandBuffer>(
gpu_channel_, kGpuStreamIdDefault, kGpuStreamPriorityDefault,
gpu::kNullSurfaceHandle,
GURL("chrome://gpu/"
"LayoutTestDependenciesImpl::CreateOutputSurface"),
automatic_flushes, support_locking, gpu::SharedMemoryLimits(),
attributes, nullptr,
- ui::command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING));
+ ui::command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING);
context_provider->BindToCurrentThread();
bool flipped_output_surface = false;
diff --git a/content/test/test_blink_web_unit_test_support.cc b/content/test/test_blink_web_unit_test_support.cc
index eb3154e3..9f4c763 100644
--- a/content/test/test_blink_web_unit_test_support.cc
+++ b/content/test/test_blink_web_unit_test_support.cc
@@ -116,7 +116,7 @@
// of message loops, and their types are not known upfront. Some tests also
// create their own thread bundles or message loops, and doing the same in
// TestBlinkWebUnitTestSupport would introduce a conflict.
- dummy_task_runner = make_scoped_refptr(new DummyTaskRunner());
+ dummy_task_runner = base::MakeRefCounted<DummyTaskRunner>();
dummy_task_runner_handle.reset(
new base::ThreadTaskRunnerHandle(dummy_task_runner));
}
diff --git a/extensions/browser/api/device_permissions_prompt.cc b/extensions/browser/api/device_permissions_prompt.cc
index c823d0e..7324d68 100644
--- a/extensions/browser/api/device_permissions_prompt.cc
+++ b/extensions/browser/api/device_permissions_prompt.cc
@@ -390,18 +390,18 @@
scoped_refptr<DevicePermissionsPrompt::Prompt>
DevicePermissionsPrompt::CreateHidPromptForTest(const Extension* extension,
bool multiple) {
- return make_scoped_refptr(new HidDevicePermissionsPrompt(
+ return base::MakeRefCounted<HidDevicePermissionsPrompt>(
extension, nullptr, multiple, std::vector<HidDeviceFilter>(),
- base::Bind(&NoopHidCallback)));
+ base::Bind(&NoopHidCallback));
}
// static
scoped_refptr<DevicePermissionsPrompt::Prompt>
DevicePermissionsPrompt::CreateUsbPromptForTest(const Extension* extension,
bool multiple) {
- return make_scoped_refptr(new UsbDevicePermissionsPrompt(
+ return base::MakeRefCounted<UsbDevicePermissionsPrompt>(
extension, nullptr, multiple, std::vector<UsbDeviceFilterPtr>(),
- base::Bind(&NoopUsbCallback)));
+ base::Bind(&NoopUsbCallback));
}
} // namespace extensions
diff --git a/extensions/browser/content_verify_job_unittest.cc b/extensions/browser/content_verify_job_unittest.cc
index e3f8434..dad557f 100644
--- a/extensions/browser/content_verify_job_unittest.cc
+++ b/extensions/browser/content_verify_job_unittest.cc
@@ -26,11 +26,11 @@
scoped_refptr<ContentHashReader> CreateContentHashReader(
const Extension& extension,
const base::FilePath& extension_resource_path) {
- return make_scoped_refptr(new ContentHashReader(
+ return base::MakeRefCounted<ContentHashReader>(
extension.id(), *extension.version(), extension.path(),
extension_resource_path,
ContentVerifierKey(kWebstoreSignaturesPublicKey,
- kWebstoreSignaturesPublicKeySize)));
+ kWebstoreSignaturesPublicKeySize));
}
void DoNothingWithReasonParam(ContentVerifyJob::FailureReason reason) {}
diff --git a/extensions/renderer/api/display_source/wifi_display/wifi_display_audio_encoder_lpcm.cc b/extensions/renderer/api/display_source/wifi_display/wifi_display_audio_encoder_lpcm.cc
index 6e6f169..4daefa3 100644
--- a/extensions/renderer/api/display_source/wifi_display/wifi_display_audio_encoder_lpcm.cc
+++ b/extensions/renderer/api/display_source/wifi_display/wifi_display_audio_encoder_lpcm.cc
@@ -231,7 +231,7 @@
const wds::AudioCodec& audio_codec,
const AudioEncoderCallback& encoder_callback) {
encoder_callback.Run(
- make_scoped_refptr(new WiFiDisplayAudioEncoderLPCM(audio_codec)));
+ base::MakeRefCounted<WiFiDisplayAudioEncoderLPCM>(audio_codec));
}
} // namespace extensions
diff --git a/gpu/ipc/service/image_transport_surface_win.cc b/gpu/ipc/service/image_transport_surface_win.cc
index 996a32e..2a0a6b2 100644
--- a/gpu/ipc/service/image_transport_surface_win.cc
+++ b/gpu/ipc/service/image_transport_surface_win.cc
@@ -52,8 +52,8 @@
if (gl::GLSurfaceEGL::IsDirectCompositionSupported()) {
scoped_refptr<DirectCompositionSurfaceWin> egl_surface =
- make_scoped_refptr(new DirectCompositionSurfaceWin(
- std::move(vsync_provider), delegate, surface_handle));
+ base::MakeRefCounted<DirectCompositionSurfaceWin>(
+ std::move(vsync_provider), delegate, surface_handle);
if (!egl_surface->Initialize())
return nullptr;
surface = egl_surface;
diff --git a/ios/chrome/browser/ios_chrome_io_thread_unittest.mm b/ios/chrome/browser/ios_chrome_io_thread_unittest.mm
index 379c30c..e148b18d 100644
--- a/ios/chrome/browser/ios_chrome_io_thread_unittest.mm
+++ b/ios/chrome/browser/ios_chrome_io_thread_unittest.mm
@@ -60,8 +60,7 @@
TEST_F(IOSChromeIOThreadTest, AssertNoUrlRequests) {
PrefServiceFactory pref_service_factory;
- pref_service_factory.set_user_prefs(
- make_scoped_refptr(new TestingPrefStore()));
+ pref_service_factory.set_user_prefs(base::MakeRefCounted<TestingPrefStore>());
scoped_refptr<PrefRegistrySimple> pref_registry = new PrefRegistrySimple;
PrefProxyConfigTrackerImpl::RegisterPrefs(pref_registry.get());
diff --git a/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc b/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc
index e60535f..cd104c0 100644
--- a/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc
+++ b/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc
@@ -35,8 +35,8 @@
void PrepareFactory(sync_preferences::PrefServiceSyncableFactory* factory,
const base::FilePath& pref_filename,
base::SequencedTaskRunner* pref_io_task_runner) {
- factory->set_user_prefs(make_scoped_refptr(new JsonPrefStore(
- pref_filename, pref_io_task_runner, std::unique_ptr<PrefFilter>())));
+ factory->set_user_prefs(base::MakeRefCounted<JsonPrefStore>(
+ pref_filename, pref_io_task_runner, std::unique_ptr<PrefFilter>()));
factory->set_read_error_callback(base::Bind(&HandleReadError));
factory->SetPrefModelAssociatorClient(
diff --git a/ios/components/io_thread/ios_io_thread_unittest.mm b/ios/components/io_thread/ios_io_thread_unittest.mm
index a01ab20..816f0ce 100644
--- a/ios/components/io_thread/ios_io_thread_unittest.mm
+++ b/ios/components/io_thread/ios_io_thread_unittest.mm
@@ -64,8 +64,7 @@
// url request context.
TEST_F(IOSIOThreadTest, AssertSystemUrlRequestContext) {
PrefServiceFactory pref_service_factory;
- pref_service_factory.set_user_prefs(
- make_scoped_refptr(new TestingPrefStore()));
+ pref_service_factory.set_user_prefs(base::MakeRefCounted<TestingPrefStore>());
scoped_refptr<PrefRegistrySimple> pref_registry = new PrefRegistrySimple;
PrefProxyConfigTrackerImpl::RegisterPrefs(pref_registry.get());
diff --git a/ipc/ipc_channel_proxy_unittest.cc b/ipc/ipc_channel_proxy_unittest.cc
index ba3be18..95182d31e 100644
--- a/ipc/ipc_channel_proxy_unittest.cc
+++ b/ipc/ipc_channel_proxy_unittest.cc
@@ -280,9 +280,9 @@
// Construct a filter per message class.
std::vector<scoped_refptr<MessageCountFilter>> class_filters;
class_filters.push_back(
- make_scoped_refptr(new MessageCountFilter(TestMsgStart)));
+ base::MakeRefCounted<MessageCountFilter>(TestMsgStart));
class_filters.push_back(
- make_scoped_refptr(new MessageCountFilter(AutomationMsgStart)));
+ base::MakeRefCounted<MessageCountFilter>(AutomationMsgStart));
for (size_t i = 0; i < class_filters.size(); ++i)
channel_proxy()->AddFilter(class_filters[i].get());
diff --git a/media/base/android/media_service_throttler_unittest.cc b/media/base/android/media_service_throttler_unittest.cc
index dfbb5a0..d091776 100644
--- a/media/base/android/media_service_throttler_unittest.cc
+++ b/media/base/android/media_service_throttler_unittest.cc
@@ -23,7 +23,7 @@
clock_->SetNowTicks(base::TimeTicks());
throttler_->SetTickClockForTesting(clock_);
test_task_runner_ =
- make_scoped_refptr(new FakeSingleThreadTaskRunner(clock_));
+ base::MakeRefCounted<FakeSingleThreadTaskRunner>(clock_);
throttler_->ResetInternalStateForTesting();
throttler_->SetCrashListenerTaskRunnerForTesting(test_task_runner_);
base_delay_ = throttler_->GetBaseThrottlingRateForTesting();
diff --git a/media/formats/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc
index 9e2c254..f3e165a 100644
--- a/media/formats/mp4/box_definitions.cc
+++ b/media/formats/mp4/box_definitions.cc
@@ -739,7 +739,7 @@
avcConfig->profile_indication);
frame_bitstream_converter =
- make_scoped_refptr(new AVCBitstreamConverter(std::move(avcConfig)));
+ base::MakeRefCounted<AVCBitstreamConverter>(std::move(avcConfig));
#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
// It can be Dolby Vision stream if there is DVCC box.
DolbyVisionConfiguration dvccConfig;
@@ -763,7 +763,7 @@
video_codec = kCodecHEVC;
video_codec_profile = hevcConfig->GetVideoProfile();
frame_bitstream_converter =
- make_scoped_refptr(new HEVCBitstreamConverter(std::move(hevcConfig)));
+ base::MakeRefCounted<HEVCBitstreamConverter>(std::move(hevcConfig));
#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
// It can be Dolby Vision stream if there is DVCC box.
DolbyVisionConfiguration dvccConfig;
@@ -784,7 +784,7 @@
new AVCDecoderConfigurationRecord());
RCHECK(reader->ReadChild(avcConfig.get()));
frame_bitstream_converter =
- make_scoped_refptr(new AVCBitstreamConverter(std::move(avcConfig)));
+ base::MakeRefCounted<AVCBitstreamConverter>(std::move(avcConfig));
DVLOG(2) << __func__ << " reading DolbyVisionConfiguration (dvcC)";
DolbyVisionConfiguration dvccConfig;
RCHECK(reader->ReadChild(&dvccConfig));
@@ -800,7 +800,7 @@
new HEVCDecoderConfigurationRecord());
RCHECK(reader->ReadChild(hevcConfig.get()));
frame_bitstream_converter =
- make_scoped_refptr(new HEVCBitstreamConverter(std::move(hevcConfig)));
+ base::MakeRefCounted<HEVCBitstreamConverter>(std::move(hevcConfig));
DVLOG(2) << __func__ << " reading DolbyVisionConfiguration (dvcC)";
DolbyVisionConfiguration dvccConfig;
RCHECK(reader->ReadChild(&dvccConfig));
diff --git a/media/gpu/android/codec_wrapper_unittest.cc b/media/gpu/android/codec_wrapper_unittest.cc
index e37bd5fe..711a01c 100644
--- a/media/gpu/android/codec_wrapper_unittest.cc
+++ b/media/gpu/android/codec_wrapper_unittest.cc
@@ -30,7 +30,7 @@
CodecWrapperTest() {
auto codec = base::MakeUnique<NiceMock<MockMediaCodecBridge>>();
codec_ = codec.get();
- surface_bundle_ = make_scoped_refptr(new AVDASurfaceBundle());
+ surface_bundle_ = base::MakeRefCounted<AVDASurfaceBundle>();
wrapper_ = base::MakeUnique<CodecWrapper>(
CodecSurfacePair(std::move(codec), surface_bundle_),
output_buffer_release_cb_.Get());
@@ -93,7 +93,7 @@
TEST_F(CodecWrapperTest, SetSurfaceInvalidatesCodecOutputBuffers) {
auto codec_buffer = DequeueCodecOutputBuffer();
- wrapper_->SetSurface(make_scoped_refptr(new AVDASurfaceBundle()));
+ wrapper_->SetSurface(base::MakeRefCounted<AVDASurfaceBundle>());
ASSERT_FALSE(codec_buffer->ReleaseToSurface());
}
@@ -271,7 +271,7 @@
}
TEST_F(CodecWrapperTest, SurfaceBundleIsUpdatedBySetSurface) {
- auto new_bundle = make_scoped_refptr(new AVDASurfaceBundle());
+ auto new_bundle = base::MakeRefCounted<AVDASurfaceBundle>();
EXPECT_CALL(*codec_, SetSurface(_)).WillOnce(Return(true));
wrapper_->SetSurface(new_bundle);
ASSERT_EQ(new_bundle.get(), wrapper_->SurfaceBundle());
diff --git a/media/gpu/d3d11_h264_accelerator.cc b/media/gpu/d3d11_h264_accelerator.cc
index 3ed6a67..3fa890e 100644
--- a/media/gpu/d3d11_h264_accelerator.cc
+++ b/media/gpu/d3d11_h264_accelerator.cc
@@ -63,7 +63,7 @@
stream_ = eglCreateStreamKHR(egl_display, stream_attributes);
RETURN_ON_FAILURE(!!stream_, "Could not create stream", false);
gl_image_ =
- make_scoped_refptr(new gl::GLImageDXGI(picture_buffer_.size(), stream_));
+ base::MakeRefCounted<gl::GLImageDXGI>(picture_buffer_.size(), stream_);
gl::ScopedActiveTexture texture0(GL_TEXTURE0);
gl::ScopedTextureBinder texture0_binder(
GL_TEXTURE_EXTERNAL_OES, picture_buffer_.service_texture_ids()[0]);
diff --git a/media/gpu/dxva_picture_buffer_win.cc b/media/gpu/dxva_picture_buffer_win.cc
index 6f9fe603..b3c2ed1 100644
--- a/media/gpu/dxva_picture_buffer_win.cc
+++ b/media/gpu/dxva_picture_buffer_win.cc
@@ -216,7 +216,7 @@
egl_display, EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE, texture_share_handle_,
egl_config, attrib_list);
RETURN_ON_FAILURE(decoding_surface_, "Failed to create surface", false);
- gl_image_ = make_scoped_refptr(new GLImagePbuffer(size(), decoding_surface_));
+ gl_image_ = base::MakeRefCounted<GLImagePbuffer>(size(), decoding_surface_);
if (decoder.d3d11_device_ && decoder.use_keyed_mutex_) {
void* keyed_mutex = nullptr;
EGLBoolean ret =
@@ -448,7 +448,7 @@
};
stream_ = eglCreateStreamKHR(egl_display, stream_attributes);
RETURN_ON_FAILURE(!!stream_, "Could not create stream", false);
- gl_image_ = make_scoped_refptr(new gl::GLImageDXGI(size(), stream_));
+ gl_image_ = base::MakeRefCounted<gl::GLImageDXGI>(size(), stream_);
gl::ScopedActiveTexture texture0(GL_TEXTURE0);
gl::ScopedTextureBinder texture0_binder(
GL_TEXTURE_EXTERNAL_OES, picture_buffer_.service_texture_ids()[0]);
@@ -600,9 +600,9 @@
producer_attributes);
RETURN_ON_FAILURE(result, "Could not create stream producer", false);
scoped_refptr<gl::CopyingGLImageDXGI> copying_image_ =
- make_scoped_refptr(new gl::CopyingGLImageDXGI(
+ base::MakeRefCounted<gl::CopyingGLImageDXGI>(
base::win::ScopedComPtr<ID3D11Device>(decoder.D3D11Device()), size(),
- stream_));
+ stream_);
gl_image_ = copying_image_;
return copying_image_->Initialize();
}
@@ -688,7 +688,7 @@
};
stream_ = eglCreateStreamKHR(egl_display, stream_attributes);
RETURN_ON_FAILURE(!!stream_, "Could not create stream", false);
- gl_image_ = make_scoped_refptr(new gl::GLImageDXGI(size(), stream_));
+ gl_image_ = base::MakeRefCounted<gl::GLImageDXGI>(size(), stream_);
gl::ScopedActiveTexture texture0(GL_TEXTURE0);
gl::ScopedTextureBinder texture0_binder(
GL_TEXTURE_EXTERNAL_OES, picture_buffer_.service_texture_ids()[0]);
diff --git a/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc b/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc
index 3dfc897..e1f03ec 100644
--- a/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc
+++ b/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc
@@ -86,8 +86,8 @@
test_clock_.Advance(base::TimeDelta::FromSeconds(1234));
gles2_.reset(new TestGLES2Interface);
- media_task_runner_ = make_scoped_refptr(new base::TestSimpleTaskRunner);
- copy_task_runner_ = make_scoped_refptr(new base::TestSimpleTaskRunner);
+ media_task_runner_ = base::MakeRefCounted<base::TestSimpleTaskRunner>();
+ copy_task_runner_ = base::MakeRefCounted<base::TestSimpleTaskRunner>();
media_task_runner_handle_.reset(
new base::ThreadTaskRunnerHandle(media_task_runner_));
mock_gpu_factories_.reset(
diff --git a/mojo/edk/system/data_pipe_consumer_dispatcher.cc b/mojo/edk/system/data_pipe_consumer_dispatcher.cc
index 9a3762c..aed5944 100644
--- a/mojo/edk/system/data_pipe_consumer_dispatcher.cc
+++ b/mojo/edk/system/data_pipe_consumer_dispatcher.cc
@@ -447,7 +447,7 @@
base::AutoUnlock unlock(lock_);
node_controller_->SetPortObserver(
- control_port_, make_scoped_refptr(new PortObserverThunk(this)));
+ control_port_, base::MakeRefCounted<PortObserverThunk>(this));
return true;
}
diff --git a/mojo/edk/system/data_pipe_producer_dispatcher.cc b/mojo/edk/system/data_pipe_producer_dispatcher.cc
index 97d25b2..53cc526 100644
--- a/mojo/edk/system/data_pipe_producer_dispatcher.cc
+++ b/mojo/edk/system/data_pipe_producer_dispatcher.cc
@@ -410,7 +410,7 @@
base::AutoUnlock unlock(lock_);
node_controller_->SetPortObserver(
- control_port_, make_scoped_refptr(new PortObserverThunk(this)));
+ control_port_, base::MakeRefCounted<PortObserverThunk>(this));
return true;
}
diff --git a/mojo/edk/system/message_pipe_dispatcher.cc b/mojo/edk/system/message_pipe_dispatcher.cc
index 1017cc0..5dc7dd1 100644
--- a/mojo/edk/system/message_pipe_dispatcher.cc
+++ b/mojo/edk/system/message_pipe_dispatcher.cc
@@ -97,7 +97,7 @@
<< " [pipe_id=" << pipe_id << "; endpoint=" << endpoint << "]";
node_controller_->SetPortObserver(
- port_, make_scoped_refptr(new PortObserverThunk(this)));
+ port_, base::MakeRefCounted<PortObserverThunk>(this));
}
bool MessagePipeDispatcher::Fuse(MessagePipeDispatcher* other) {
diff --git a/mojo/public/cpp/bindings/thread_safe_interface_ptr.h b/mojo/public/cpp/bindings/thread_safe_interface_ptr.h
index 7ca832831..53182fb 100644
--- a/mojo/public/cpp/bindings/thread_safe_interface_ptr.h
+++ b/mojo/public/cpp/bindings/thread_safe_interface_ptr.h
@@ -133,7 +133,7 @@
// If the InterfacePtr is bound on another sequence, post the call.
// TODO(yzshen, watk): We block both this sequence and the InterfacePtr
// sequence. Ideally only this sequence would block.
- auto response = make_scoped_refptr(new SyncResponseInfo());
+ auto response = base::MakeRefCounted<SyncResponseInfo>();
auto response_signaler = std::make_unique<SyncResponseSignaler>(response);
task_runner_->PostTask(
FROM_HERE, base::Bind(forward_with_responder_, base::Passed(message),
diff --git a/net/cert/cert_verify_proc_android_unittest.cc b/net/cert/cert_verify_proc_android_unittest.cc
index d2f90bc..f5f06a6 100644
--- a/net/cert/cert_verify_proc_android_unittest.cc
+++ b/net/cert/cert_verify_proc_android_unittest.cc
@@ -142,7 +142,7 @@
class CertVerifyProcAndroidTestWithAIAFetching : public testing::Test {
public:
void SetUp() override {
- fetcher_ = make_scoped_refptr(new MockCertNetFetcher());
+ fetcher_ = base::MakeRefCounted<MockCertNetFetcher>();
CertVerifyProcAndroid::SetCertNetFetcherForTesting(fetcher_);
}
@@ -178,7 +178,7 @@
NoFetchIfProperIntermediatesSupplied) {
ASSERT_TRUE(SetUpTestRoot());
scoped_refptr<CertVerifyProcAndroid> proc =
- make_scoped_refptr(new CertVerifyProcAndroid());
+ base::MakeRefCounted<CertVerifyProcAndroid>();
scoped_refptr<X509Certificate> leaf;
ASSERT_TRUE(
CreateCertificateChainFromFiles({"target_one_aia.pem", "i.pem"}, &leaf));
@@ -192,7 +192,7 @@
TEST_F(CertVerifyProcAndroidTestWithAIAFetching, NoAIAURL) {
ASSERT_TRUE(SetUpTestRoot());
scoped_refptr<CertVerifyProcAndroid> proc =
- make_scoped_refptr(new CertVerifyProcAndroid());
+ base::MakeRefCounted<CertVerifyProcAndroid>();
scoped_refptr<X509Certificate> cert;
ASSERT_TRUE(ReadTestCert("target_no_aia.pem", &cert));
CertVerifyResult verify_result;
@@ -207,7 +207,7 @@
TEST_F(CertVerifyProcAndroidTestWithAIAFetching, OneFileAndOneHTTPURL) {
ASSERT_TRUE(SetUpTestRoot());
scoped_refptr<CertVerifyProcAndroid> proc =
- make_scoped_refptr(new CertVerifyProcAndroid());
+ base::MakeRefCounted<CertVerifyProcAndroid>();
scoped_refptr<X509Certificate> cert;
ASSERT_TRUE(ReadTestCert("target_file_and_http_aia.pem", &cert));
scoped_refptr<X509Certificate> intermediate;
@@ -236,7 +236,7 @@
UnsuccessfulVerificationWithLeafOnly) {
ASSERT_TRUE(SetUpTestRoot());
scoped_refptr<CertVerifyProcAndroid> proc =
- make_scoped_refptr(new CertVerifyProcAndroid());
+ base::MakeRefCounted<CertVerifyProcAndroid>();
scoped_refptr<X509Certificate> cert;
ASSERT_TRUE(ReadTestCert("target_one_aia.pem", &cert));
const scoped_refptr<X509Certificate> bad_intermediate =
@@ -258,7 +258,7 @@
UnsuccessfulVerificationWithLeafOnlyAndErrorOnFetch) {
ASSERT_TRUE(SetUpTestRoot());
scoped_refptr<CertVerifyProcAndroid> proc =
- make_scoped_refptr(new CertVerifyProcAndroid());
+ base::MakeRefCounted<CertVerifyProcAndroid>();
scoped_refptr<X509Certificate> cert;
ASSERT_TRUE(ReadTestCert("target_one_aia.pem", &cert));
@@ -277,7 +277,7 @@
UnsuccessfulVerificationWithLeafOnlyAndUnparseableFetch) {
ASSERT_TRUE(SetUpTestRoot());
scoped_refptr<CertVerifyProcAndroid> proc =
- make_scoped_refptr(new CertVerifyProcAndroid());
+ base::MakeRefCounted<CertVerifyProcAndroid>();
scoped_refptr<X509Certificate> cert;
ASSERT_TRUE(ReadTestCert("target_one_aia.pem", &cert));
@@ -296,7 +296,7 @@
TEST_F(CertVerifyProcAndroidTestWithAIAFetching, TwoHTTPURLs) {
ASSERT_TRUE(SetUpTestRoot());
scoped_refptr<CertVerifyProcAndroid> proc =
- make_scoped_refptr(new CertVerifyProcAndroid());
+ base::MakeRefCounted<CertVerifyProcAndroid>();
scoped_refptr<X509Certificate> cert;
ASSERT_TRUE(ReadTestCert("target_two_aia.pem", &cert));
scoped_refptr<X509Certificate> intermediate;
@@ -330,7 +330,7 @@
// then the intermediate i2.pem would not require an AIA fetch. With the test
// root untrusted, i2.pem does not verify and so it will trigger an AIA fetch.
scoped_refptr<CertVerifyProcAndroid> proc =
- make_scoped_refptr(new CertVerifyProcAndroid());
+ base::MakeRefCounted<CertVerifyProcAndroid>();
scoped_refptr<X509Certificate> cert;
ASSERT_TRUE(ReadTestCert("target_one_aia.pem", &cert));
scoped_refptr<X509Certificate> intermediate;
@@ -360,7 +360,7 @@
TEST_F(CertVerifyProcAndroidTestWithAIAFetching, MaxAIAFetches) {
ASSERT_TRUE(SetUpTestRoot());
scoped_refptr<CertVerifyProcAndroid> proc =
- make_scoped_refptr(new CertVerifyProcAndroid());
+ base::MakeRefCounted<CertVerifyProcAndroid>();
scoped_refptr<X509Certificate> cert;
ASSERT_TRUE(ReadTestCert("target_six_aia.pem", &cert));
@@ -384,7 +384,7 @@
// then the intermediate i.pem would not require an AIA fetch. With the test
// root untrusted, i.pem does not verify and so it will trigger an AIA fetch.
scoped_refptr<CertVerifyProcAndroid> proc =
- make_scoped_refptr(new CertVerifyProcAndroid());
+ base::MakeRefCounted<CertVerifyProcAndroid>();
scoped_refptr<X509Certificate> leaf;
ASSERT_TRUE(
CreateCertificateChainFromFiles({"target_one_aia.pem", "i.pem"}, &leaf));
diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc
index 57d3a28..bae8ea26 100644
--- a/net/cert/cert_verify_proc_unittest.cc
+++ b/net/cert/cert_verify_proc_unittest.cc
@@ -1433,7 +1433,7 @@
// However, if the CA is not well known, these should not be flagged:
dummy_result.Reset();
dummy_result.is_issued_by_known_root = false;
- verify_proc = make_scoped_refptr(new MockCertVerifyProc(dummy_result));
+ verify_proc = base::MakeRefCounted<MockCertVerifyProc>(dummy_result);
error = verify_proc->Verify(cert.get(), "webmail", std::string(), 0, nullptr,
CertificateList(), &verify_result);
EXPECT_THAT(error, IsOk());
@@ -1480,7 +1480,7 @@
dummy_result.is_issued_by_known_root = true;
dummy_result.has_sha1 = true;
dummy_result.has_sha1_leaf = true;
- verify_proc = make_scoped_refptr(new MockCertVerifyProc(dummy_result));
+ verify_proc = base::MakeRefCounted<MockCertVerifyProc>(dummy_result);
cert = CreateCertificateChainFromFile(GetTestCertsDirectory(),
"sha1_jan_2016.pem",
X509Certificate::FORMAT_AUTO);
@@ -1497,7 +1497,7 @@
dummy_result.is_issued_by_known_root = false;
dummy_result.has_sha1 = true;
dummy_result.has_sha1_leaf = true;
- verify_proc = make_scoped_refptr(new MockCertVerifyProc(dummy_result));
+ verify_proc = base::MakeRefCounted<MockCertVerifyProc>(dummy_result);
cert = CreateCertificateChainFromFile(GetTestCertsDirectory(),
"sha1_jan_2016.pem",
X509Certificate::FORMAT_AUTO);
@@ -1514,7 +1514,7 @@
dummy_result.is_issued_by_known_root = true;
dummy_result.has_sha1 = true;
dummy_result.has_sha1_leaf = false;
- verify_proc = make_scoped_refptr(new MockCertVerifyProc(dummy_result));
+ verify_proc = base::MakeRefCounted<MockCertVerifyProc>(dummy_result);
cert = CreateCertificateChainFromFile(GetTestCertsDirectory(),
"sha1_jan_2016.pem",
X509Certificate::FORMAT_AUTO);
diff --git a/net/cert/internal/cert_issuer_source_aia_unittest.cc b/net/cert/internal/cert_issuer_source_aia_unittest.cc
index 505d586..6003335 100644
--- a/net/cert/internal/cert_issuer_source_aia_unittest.cc
+++ b/net/cert/internal/cert_issuer_source_aia_unittest.cc
@@ -122,7 +122,7 @@
ASSERT_TRUE(ReadTestCert("target_two_aia.pem", &cert));
// No methods on |mock_fetcher| should be called.
- auto mock_fetcher = make_scoped_refptr(new StrictMock<MockCertNetFetcher>());
+ auto mock_fetcher = base::MakeRefCounted<StrictMock<MockCertNetFetcher>>();
CertIssuerSourceAia aia_source(mock_fetcher);
ParsedCertificateList issuers;
aia_source.SyncGetIssuersOf(cert.get(), &issuers);
@@ -136,7 +136,7 @@
ASSERT_TRUE(ReadTestCert("target_no_aia.pem", &cert));
// No methods on |mock_fetcher| should be called.
- auto mock_fetcher = make_scoped_refptr(new StrictMock<MockCertNetFetcher>());
+ auto mock_fetcher = base::MakeRefCounted<StrictMock<MockCertNetFetcher>>();
CertIssuerSourceAia aia_source(mock_fetcher);
std::unique_ptr<CertIssuerSource::Request> request;
aia_source.AsyncGetIssuersOf(cert.get(), &request);
@@ -152,7 +152,7 @@
scoped_refptr<ParsedCertificate> cert;
ASSERT_TRUE(ReadTestCert("target_file_aia.pem", &cert));
- auto mock_fetcher = make_scoped_refptr(new StrictMock<MockCertNetFetcher>());
+ auto mock_fetcher = base::MakeRefCounted<StrictMock<MockCertNetFetcher>>();
EXPECT_CALL(*mock_fetcher, FetchCaIssuers(GURL("file:///dev/null"), _, _))
.WillOnce(Return(ByMove(CreateMockRequest(ERR_DISALLOWED_URL_SCHEME))));
@@ -173,7 +173,7 @@
scoped_refptr<ParsedCertificate> cert;
ASSERT_TRUE(ReadTestCert("target_invalid_url_aia.pem", &cert));
- auto mock_fetcher = make_scoped_refptr(new StrictMock<MockCertNetFetcher>());
+ auto mock_fetcher = base::MakeRefCounted<StrictMock<MockCertNetFetcher>>();
CertIssuerSourceAia aia_source(mock_fetcher);
std::unique_ptr<CertIssuerSource::Request> request;
aia_source.AsyncGetIssuersOf(cert.get(), &request);
@@ -187,7 +187,7 @@
scoped_refptr<ParsedCertificate> intermediate_cert;
ASSERT_TRUE(ReadTestCert("i.pem", &intermediate_cert));
- auto mock_fetcher = make_scoped_refptr(new StrictMock<MockCertNetFetcher>());
+ auto mock_fetcher = base::MakeRefCounted<StrictMock<MockCertNetFetcher>>();
EXPECT_CALL(*mock_fetcher,
FetchCaIssuers(GURL("http://url-for-aia/I.cer"), _, _))
@@ -219,7 +219,7 @@
scoped_refptr<ParsedCertificate> intermediate_cert;
ASSERT_TRUE(ReadTestCert("i2.pem", &intermediate_cert));
- auto mock_fetcher = make_scoped_refptr(new StrictMock<MockCertNetFetcher>());
+ auto mock_fetcher = base::MakeRefCounted<StrictMock<MockCertNetFetcher>>();
EXPECT_CALL(*mock_fetcher, FetchCaIssuers(GURL("file:///dev/null"), _, _))
.WillOnce(Return(ByMove(CreateMockRequest(ERR_DISALLOWED_URL_SCHEME))));
diff --git a/net/cert_net/cert_net_fetcher_impl.cc b/net/cert_net/cert_net_fetcher_impl.cc
index 727a124..8545f54 100644
--- a/net/cert_net/cert_net_fetcher_impl.cc
+++ b/net/cert_net/cert_net_fetcher_impl.cc
@@ -816,7 +816,7 @@
} // namespace
scoped_refptr<CertNetFetcher> CreateCertNetFetcher(URLRequestContext* context) {
- return make_scoped_refptr(new CertNetFetcherImpl(context));
+ return base::MakeRefCounted<CertNetFetcherImpl>(context);
}
} // namespace net
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
index a118257..7b38234 100644
--- a/net/dns/dns_config_service_posix.cc
+++ b/net/dns/dns_config_service_posix.cc
@@ -449,7 +449,7 @@
dns_config_for_testing_ = dns_config;
// Reset ConfigReader to bind new DnsConfig for testing.
config_reader_->Cancel();
- config_reader_ = make_scoped_refptr(new ConfigReader(this));
+ config_reader_ = base::MakeRefCounted<ConfigReader>(this);
}
void DnsConfigServicePosix::SetHostsFilePathForTesting(
@@ -458,7 +458,7 @@
file_path_hosts_ = file_path;
// Reset HostsReader to bind new hosts file path.
hosts_reader_->Cancel();
- hosts_reader_ = make_scoped_refptr(new HostsReader(this));
+ hosts_reader_ = base::MakeRefCounted<HostsReader>(this);
// If watching, reset to bind new hosts file path and resume watching.
if (watcher_) {
watcher_.reset(new Watcher(this));
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index 39a11f0..bb25daf 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -147,13 +147,13 @@
scoped_refptr<SSLSocketParams> SSLParams(ProxyServer::Scheme proxy,
bool expect_spdy) {
- return make_scoped_refptr(new SSLSocketParams(
+ return base::MakeRefCounted<SSLSocketParams>(
proxy == ProxyServer::SCHEME_DIRECT ? direct_transport_socket_params_
: NULL,
proxy == ProxyServer::SCHEME_SOCKS5 ? socks_socket_params_ : NULL,
proxy == ProxyServer::SCHEME_HTTP ? http_proxy_socket_params_ : NULL,
HostPortPair("host", 443), ssl_config_, PRIVACY_MODE_DISABLED, 0,
- expect_spdy));
+ expect_spdy);
}
void AddAuthToCache() {
diff --git a/net/ssl/channel_id_service_unittest.cc b/net/ssl/channel_id_service_unittest.cc
index db3160f..d14edaed 100644
--- a/net/ssl/channel_id_service_unittest.cc
+++ b/net/ssl/channel_id_service_unittest.cc
@@ -360,7 +360,7 @@
// tasks gracefully fails. This is a regression test for http://crbug.com/236387
TEST_F(ChannelIDServiceTest, RequestAfterPoolShutdown) {
service_->set_task_runner_for_testing(
- make_scoped_refptr(new base::NullTaskRunner()));
+ base::MakeRefCounted<base::NullTaskRunner>());
// Make a request that will force synchronous completion.
std::string host("encrypted.google.com");
diff --git a/net/ssl/ssl_platform_key_android.cc b/net/ssl/ssl_platform_key_android.cc
index 2c750c74..a67e165 100644
--- a/net/ssl/ssl_platform_key_android.cc
+++ b/net/ssl/ssl_platform_key_android.cc
@@ -205,9 +205,9 @@
}
}
- return make_scoped_refptr(new ThreadedSSLPrivateKey(
+ return base::MakeRefCounted<ThreadedSSLPrivateKey>(
std::make_unique<SSLPlatformKeyAndroid>(type, key, max_length, sys_rsa),
- GetSSLPlatformKeyTaskRunner()));
+ GetSSLPlatformKeyTaskRunner());
}
} // namespace net
diff --git a/net/ssl/ssl_platform_key_mac.cc b/net/ssl/ssl_platform_key_mac.cc
index 4476cc4..41be562 100644
--- a/net/ssl/ssl_platform_key_mac.cc
+++ b/net/ssl/ssl_platform_key_mac.cc
@@ -369,10 +369,10 @@
return nullptr;
}
- return make_scoped_refptr(new ThreadedSSLPrivateKey(
+ return base::MakeRefCounted<ThreadedSSLPrivateKey>(
std::make_unique<SSLPlatformKeyCSSM>(key_type, max_length, private_key,
cssm_key),
- GetSSLPlatformKeyTaskRunner()));
+ GetSSLPlatformKeyTaskRunner());
}
} // namespace
diff --git a/net/ssl/ssl_platform_key_nss.cc b/net/ssl/ssl_platform_key_nss.cc
index c3162f1..d8af54d1 100644
--- a/net/ssl/ssl_platform_key_nss.cc
+++ b/net/ssl/ssl_platform_key_nss.cc
@@ -175,9 +175,9 @@
if (!GetClientCertInfo(certificate, &type, &max_length))
return nullptr;
- return make_scoped_refptr(new ThreadedSSLPrivateKey(
+ return base::MakeRefCounted<ThreadedSSLPrivateKey>(
std::make_unique<SSLPlatformKeyNSS>(type, std::move(key)),
- GetSSLPlatformKeyTaskRunner()));
+ GetSSLPlatformKeyTaskRunner());
}
} // namespace net
diff --git a/net/ssl/ssl_platform_key_win.cc b/net/ssl/ssl_platform_key_win.cc
index 422956a..46df075 100644
--- a/net/ssl/ssl_platform_key_win.cc
+++ b/net/ssl/ssl_platform_key_win.cc
@@ -236,9 +236,9 @@
const X509Certificate* certificate,
HCRYPTPROV prov,
DWORD key_spec) {
- return make_scoped_refptr(new ThreadedSSLPrivateKey(
+ return base::MakeRefCounted<ThreadedSSLPrivateKey>(
std::make_unique<SSLPlatformKeyCAPI>(prov, key_spec),
- GetSSLPlatformKeyTaskRunner()));
+ GetSSLPlatformKeyTaskRunner());
}
scoped_refptr<SSLPrivateKey> WrapCNGPrivateKey(
@@ -254,9 +254,9 @@
return nullptr;
}
- return make_scoped_refptr(new ThreadedSSLPrivateKey(
+ return base::MakeRefCounted<ThreadedSSLPrivateKey>(
std::make_unique<SSLPlatformKeyCNG>(key, key_type, max_length),
- GetSSLPlatformKeyTaskRunner()));
+ GetSSLPlatformKeyTaskRunner());
}
scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(
diff --git a/net/ssl/test_ssl_private_key.cc b/net/ssl/test_ssl_private_key.cc
index 38d9d30d..fb03052f 100644
--- a/net/ssl/test_ssl_private_key.cc
+++ b/net/ssl/test_ssl_private_key.cc
@@ -104,9 +104,9 @@
if (!key)
return nullptr;
- return make_scoped_refptr(new ThreadedSSLPrivateKey(
+ return base::MakeRefCounted<ThreadedSSLPrivateKey>(
std::make_unique<TestSSLPlatformKey>(std::move(key)),
- GetSSLPlatformKeyTaskRunner()));
+ GetSSLPlatformKeyTaskRunner());
}
scoped_refptr<SSLPrivateKey> WrapRSAPrivateKey(
diff --git a/ppapi/host/resource_message_filter.h b/ppapi/host/resource_message_filter.h
index 31b469c..42658ea 100644
--- a/ppapi/host/resource_message_filter.h
+++ b/ppapi/host/resource_message_filter.h
@@ -71,7 +71,7 @@
// }
//
// The filter should then be added in the resource host using:
-// AddFilter(make_scoped_refptr(new MyMessageFilter));
+// AddFilter(base::MakeRefCounted<MyMessageFilter>());
class PPAPI_HOST_EXPORT ResourceMessageFilter
: public ResourceMessageHandler,
public base::RefCountedThreadSafe<
diff --git a/printing/backend/print_backend_chromeos.cc b/printing/backend/print_backend_chromeos.cc
index 02b082d..c248d481 100644
--- a/printing/backend/print_backend_chromeos.cc
+++ b/printing/backend/print_backend_chromeos.cc
@@ -110,7 +110,7 @@
return make_scoped_refptr(
new PrintBackendCupsIpp(CreateConnection(print_backend_settings)));
#else
- return make_scoped_refptr(new PrintBackendChromeOS());
+ return base::MakeRefCounted<PrintBackendChromeOS>();
#endif // defined(USE_CUPS)
}
diff --git a/services/preferences/persistent_pref_store_impl_unittest.cc b/services/preferences/persistent_pref_store_impl_unittest.cc
index a3daac3..c7584a9 100644
--- a/services/preferences/persistent_pref_store_impl_unittest.cc
+++ b/services/preferences/persistent_pref_store_impl_unittest.cc
@@ -85,8 +85,8 @@
PersistentPrefStoreImpl::ObservedPrefs()) {
if (observed_prefs.empty())
observed_prefs.insert({kKey, kOtherKey});
- return make_scoped_refptr(new PersistentPrefStoreClient(
- impl_->CreateConnection(std::move(observed_prefs))));
+ return base::MakeRefCounted<PersistentPrefStoreClient>(
+ impl_->CreateConnection(std::move(observed_prefs)));
}
PersistentPrefStore* pref_store() { return pref_store_.get(); }
@@ -105,7 +105,7 @@
constexpr char kUnregisteredKey[] = "path.to.unregistered_key";
constexpr char kUnregisteredTopLevelKey[] = "unregistered_key";
constexpr char kUnregisteredPrefixKey[] = "p";
- auto backing_pref_store = make_scoped_refptr(new InMemoryPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<InMemoryPrefStore>();
const base::Value value("value");
backing_pref_store->SetValue(kKey, value.CreateDeepCopy(), 0);
backing_pref_store->SetValue(kUnregisteredKey, value.CreateDeepCopy(), 0);
@@ -125,7 +125,7 @@
}
TEST_F(PersistentPrefStoreImplTest, InitialValueWithoutPathExpansion) {
- auto backing_pref_store = make_scoped_refptr(new InMemoryPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<InMemoryPrefStore>();
base::DictionaryValue dict;
dict.SetKey(kKey, base::Value("value"));
backing_pref_store->SetValue(kKey, dict.CreateDeepCopy(), 0);
@@ -137,7 +137,7 @@
}
TEST_F(PersistentPrefStoreImplTest, WriteObservedByOtherClient) {
- auto backing_pref_store = make_scoped_refptr(new InMemoryPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<InMemoryPrefStore>();
CreateImpl(backing_pref_store);
EXPECT_TRUE(pref_store()->IsInitializationComplete());
@@ -154,7 +154,7 @@
}
TEST_F(PersistentPrefStoreImplTest, UnregisteredPrefNotObservedByOtherClient) {
- auto backing_pref_store = make_scoped_refptr(new InMemoryPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<InMemoryPrefStore>();
CreateImpl(backing_pref_store);
EXPECT_TRUE(pref_store()->IsInitializationComplete());
@@ -173,7 +173,7 @@
TEST_F(PersistentPrefStoreImplTest,
WriteWithoutPathExpansionObservedByOtherClient) {
- auto backing_pref_store = make_scoped_refptr(new InMemoryPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<InMemoryPrefStore>();
CreateImpl(backing_pref_store);
EXPECT_TRUE(pref_store()->IsInitializationComplete());
@@ -191,7 +191,7 @@
}
TEST_F(PersistentPrefStoreImplTest, RemoveObservedByOtherClient) {
- auto backing_pref_store = make_scoped_refptr(new InMemoryPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<InMemoryPrefStore>();
const base::Value value("value");
backing_pref_store->SetValue(kKey, value.CreateDeepCopy(), 0);
CreateImpl(backing_pref_store);
@@ -215,7 +215,7 @@
TEST_F(PersistentPrefStoreImplTest,
RemoveWithoutPathExpansionObservedByOtherClient) {
- auto backing_pref_store = make_scoped_refptr(new InMemoryPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<InMemoryPrefStore>();
base::DictionaryValue dict;
dict.SetKey(kKey, base::Value("value"));
backing_pref_store->SetValue(kKey, dict.CreateDeepCopy(), 0);
@@ -245,7 +245,7 @@
}
TEST_F(PersistentPrefStoreImplTest, CommitPendingWrite) {
- auto backing_store = make_scoped_refptr(new PersistentPrefStoreMock);
+ auto backing_store = base::MakeRefCounted<PersistentPrefStoreMock>();
CreateImpl(backing_store);
base::RunLoop run_loop;
EXPECT_CALL(*backing_store, CommitPendingWriteMock()).Times(2);
@@ -254,7 +254,7 @@
}
TEST_F(PersistentPrefStoreImplTest, SchedulePendingLossyWrites) {
- auto backing_store = make_scoped_refptr(new PersistentPrefStoreMock);
+ auto backing_store = base::MakeRefCounted<PersistentPrefStoreMock>();
CreateImpl(backing_store);
base::RunLoop run_loop;
EXPECT_CALL(*backing_store, SchedulePendingLossyWrites())
@@ -265,7 +265,7 @@
}
TEST_F(PersistentPrefStoreImplTest, ClearMutableValues) {
- auto backing_store = make_scoped_refptr(new PersistentPrefStoreMock);
+ auto backing_store = base::MakeRefCounted<PersistentPrefStoreMock>();
CreateImpl(backing_store);
base::RunLoop run_loop;
EXPECT_CALL(*backing_store, ClearMutableValues())
diff --git a/services/preferences/pref_store_impl_unittest.cc b/services/preferences/pref_store_impl_unittest.cc
index 3f20233e..80bdb70 100644
--- a/services/preferences/pref_store_impl_unittest.cc
+++ b/services/preferences/pref_store_impl_unittest.cc
@@ -132,7 +132,7 @@
};
TEST_F(PrefStoreImplTest, InitializationSuccess) {
- auto backing_pref_store = make_scoped_refptr(new MockPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<MockPrefStore>();
backing_pref_store->SetValue(kKey, base::MakeUnique<base::Value>("value"), 0);
CreateImpl(backing_pref_store);
EXPECT_FALSE(pref_store()->IsInitializationComplete());
@@ -143,7 +143,7 @@
}
TEST_F(PrefStoreImplTest, InitializationFailure) {
- auto backing_pref_store = make_scoped_refptr(new MockPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<MockPrefStore>();
backing_pref_store->SetValue(kKey, base::MakeUnique<base::Value>("value"), 0);
CreateImpl(backing_pref_store);
EXPECT_FALSE(pref_store()->IsInitializationComplete());
@@ -156,7 +156,7 @@
}
TEST_F(PrefStoreImplTest, ValueChangesBeforeInitializationCompletes) {
- auto backing_pref_store = make_scoped_refptr(new MockPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<MockPrefStore>();
CreateImpl(backing_pref_store);
EXPECT_FALSE(pref_store()->IsInitializationComplete());
@@ -176,7 +176,7 @@
}
TEST_F(PrefStoreImplTest, InitialValue) {
- auto backing_pref_store = make_scoped_refptr(new ValueMapPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<ValueMapPrefStore>();
const base::Value value("value");
backing_pref_store->SetValue(kKey, value.CreateDeepCopy(), 0);
CreateImpl(backing_pref_store);
@@ -187,7 +187,7 @@
}
TEST_F(PrefStoreImplTest, InitialValueWithoutPathExpansion) {
- auto backing_pref_store = make_scoped_refptr(new ValueMapPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<ValueMapPrefStore>();
base::DictionaryValue dict;
dict.SetKey(kKey, base::Value("value"));
backing_pref_store->SetValue(kKey, dict.CreateDeepCopy(), 0);
@@ -199,7 +199,7 @@
}
TEST_F(PrefStoreImplTest, WriteObservedByClient) {
- auto backing_pref_store = make_scoped_refptr(new ValueMapPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<ValueMapPrefStore>();
CreateImpl(backing_pref_store);
ASSERT_TRUE(pref_store()->IsInitializationComplete());
@@ -213,7 +213,7 @@
}
TEST_F(PrefStoreImplTest, WriteToUnregisteredPrefNotObservedByClient) {
- auto backing_pref_store = make_scoped_refptr(new ValueMapPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<ValueMapPrefStore>();
CreateImpl(backing_pref_store, {kKey});
ASSERT_TRUE(pref_store()->IsInitializationComplete());
@@ -226,7 +226,7 @@
}
TEST_F(PrefStoreImplTest, WriteWithoutPathExpansionObservedByClient) {
- auto backing_pref_store = make_scoped_refptr(new ValueMapPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<ValueMapPrefStore>();
CreateImpl(backing_pref_store);
ASSERT_TRUE(pref_store()->IsInitializationComplete());
@@ -241,7 +241,7 @@
}
TEST_F(PrefStoreImplTest, RemoveObservedByClient) {
- auto backing_pref_store = make_scoped_refptr(new ValueMapPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<ValueMapPrefStore>();
const base::Value value("value");
backing_pref_store->SetValue(kKey, value.CreateDeepCopy(), 0);
CreateImpl(backing_pref_store);
@@ -261,7 +261,7 @@
}
TEST_F(PrefStoreImplTest, RemoveOfUnregisteredPrefNotObservedByClient) {
- auto backing_pref_store = make_scoped_refptr(new ValueMapPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<ValueMapPrefStore>();
const base::Value value("value");
backing_pref_store->SetValue(kKey, value.CreateDeepCopy(), 0);
backing_pref_store->SetValue(kOtherKey, value.CreateDeepCopy(), 0);
@@ -275,7 +275,7 @@
}
TEST_F(PrefStoreImplTest, RemoveWithoutPathExpansionObservedByOtherClient) {
- auto backing_pref_store = make_scoped_refptr(new ValueMapPrefStore());
+ auto backing_pref_store = base::MakeRefCounted<ValueMapPrefStore>();
base::DictionaryValue dict;
dict.SetKey(kKey, base::Value("value"));
backing_pref_store->SetValue(kKey, dict.CreateDeepCopy(), 0);
diff --git a/services/preferences/public/cpp/tests/persistent_pref_store_client_unittest.cc b/services/preferences/public/cpp/tests/persistent_pref_store_client_unittest.cc
index 9582c38..f832a83 100644
--- a/services/preferences/public/cpp/tests/persistent_pref_store_client_unittest.cc
+++ b/services/preferences/public/cpp/tests/persistent_pref_store_client_unittest.cc
@@ -45,7 +45,7 @@
base::MakeUnique<base::DictionaryValue>(), true),
std::move(store_proxy), ::PersistentPrefStore::PREF_READ_ERROR_NONE,
false)));
- auto pref_registry = make_scoped_refptr(new PrefRegistrySimple());
+ auto pref_registry = base::MakeRefCounted<PrefRegistrySimple>();
pref_registry->RegisterDictionaryPref(kDictionaryKey);
pref_registry->RegisterDictionaryPref(kUninitializedDictionaryKey);
PrefNotifierImpl* pref_notifier = new PrefNotifierImpl;
diff --git a/services/preferences/public/cpp/tests/pref_store_client_unittest.cc b/services/preferences/public/cpp/tests/pref_store_client_unittest.cc
index 8952cbf5..90cf119d 100644
--- a/services/preferences/public/cpp/tests/pref_store_client_unittest.cc
+++ b/services/preferences/public/cpp/tests/pref_store_client_unittest.cc
@@ -171,8 +171,8 @@
auto prefs = base::MakeUnique<base::DictionaryValue>();
prefs->Set(key, pref.CreateDeepCopy());
auto store =
- make_scoped_refptr(new PrefStoreClient(mojom::PrefStoreConnection::New(
- mojo::MakeRequest(&observer_ptr), std::move(prefs), true)));
+ base::MakeRefCounted<PrefStoreClient>(mojom::PrefStoreConnection::New(
+ mojo::MakeRequest(&observer_ptr), std::move(prefs), true));
store->AddObserver(&observer);
const base::Value* value = nullptr;
diff --git a/services/ui/common/task_runner_test_base.cc b/services/ui/common/task_runner_test_base.cc
index f132ba9..1e1b133 100644
--- a/services/ui/common/task_runner_test_base.cc
+++ b/services/ui/common/task_runner_test_base.cc
@@ -23,8 +23,8 @@
}
void TaskRunnerTestBase::SetUp() {
- task_runner_ = make_scoped_refptr(new base::TestMockTimeTaskRunner(
- base::Time::Now(), base::TimeTicks::Now()));
+ task_runner_ = base::MakeRefCounted<base::TestMockTimeTaskRunner>(
+ base::Time::Now(), base::TimeTicks::Now());
message_loop_.SetTaskRunner(task_runner_);
}
diff --git a/services/ui/input_devices/input_device_unittests.cc b/services/ui/input_devices/input_device_unittests.cc
index 48f6a58..6fea3da 100644
--- a/services/ui/input_devices/input_device_unittests.cc
+++ b/services/ui/input_devices/input_device_unittests.cc
@@ -54,8 +54,8 @@
// testing::Test:
void SetUp() override {
- task_runner_ = make_scoped_refptr(new base::TestMockTimeTaskRunner(
- base::Time::Now(), base::TimeTicks::Now()));
+ task_runner_ = base::MakeRefCounted<base::TestMockTimeTaskRunner>(
+ base::Time::Now(), base::TimeTicks::Now());
message_loop_.SetTaskRunner(task_runner_);
DeviceDataManager::CreateInstance();
diff --git a/services/ui/public/cpp/gpu/gpu.cc b/services/ui/public/cpp/gpu/gpu.cc
index fefcc03..4cf9938d 100644
--- a/services/ui/public/cpp/gpu/gpu.cc
+++ b/services/ui/public/cpp/gpu/gpu.cc
@@ -83,11 +83,11 @@
attributes.bind_generates_resource = false;
attributes.lose_context_when_out_of_memory = true;
ui::ContextProviderCommandBuffer* shared_context_provider = nullptr;
- return make_scoped_refptr(new ui::ContextProviderCommandBuffer(
+ return base::MakeRefCounted<ui::ContextProviderCommandBuffer>(
std::move(gpu_channel), stream_id, stream_priority,
gpu::kNullSurfaceHandle, GURL("chrome://gpu/MusContextFactory"),
automatic_flushes, support_locking, gpu::SharedMemoryLimits(), attributes,
- shared_context_provider, ui::command_buffer_metrics::MUS_CLIENT_CONTEXT));
+ shared_context_provider, ui::command_buffer_metrics::MUS_CLIENT_CONTEXT);
}
void Gpu::CreateJpegDecodeAccelerator(
diff --git a/storage/browser/blob/blob_memory_controller_unittest.cc b/storage/browser/blob/blob_memory_controller_unittest.cc
index 2ab02f0e..ca71ad8 100644
--- a/storage/browser/blob/blob_memory_controller_unittest.cc
+++ b/storage/browser/blob/blob_memory_controller_unittest.cc
@@ -78,8 +78,8 @@
const BlobDataBuilder& builder) {
std::vector<scoped_refptr<ShareableBlobDataItem>> result;
for (size_t i = 0; i < builder.items_.size(); ++i) {
- result.push_back(make_scoped_refptr(new ShareableBlobDataItem(
- builder.items_[i], ShareableBlobDataItem::QUOTA_NEEDED)));
+ result.push_back(base::MakeRefCounted<ShareableBlobDataItem>(
+ builder.items_[i], ShareableBlobDataItem::QUOTA_NEEDED));
}
return result;
}
diff --git a/storage/browser/test/test_file_system_context.cc b/storage/browser/test/test_file_system_context.cc
index 074be842..b54e8e0 100644
--- a/storage/browser/test/test_file_system_context.cc
+++ b/storage/browser/test/test_file_system_context.cc
@@ -40,7 +40,7 @@
return new storage::FileSystemContext(
io_task_runner.get(), file_task_runner.get(),
storage::ExternalMountPoints::CreateRefCounted().get(),
- make_scoped_refptr(new MockSpecialStoragePolicy()).get(),
+ base::MakeRefCounted<MockSpecialStoragePolicy>().get(),
quota_manager_proxy, std::move(additional_providers),
std::vector<storage::URLRequestAutoMountHandler>(), base_path,
CreateAllowFileAccessOptions());
@@ -56,7 +56,7 @@
base::ThreadTaskRunnerHandle::Get().get(),
base::ThreadTaskRunnerHandle::Get().get(),
storage::ExternalMountPoints::CreateRefCounted().get(),
- make_scoped_refptr(new MockSpecialStoragePolicy()).get(),
+ base::MakeRefCounted<MockSpecialStoragePolicy>().get(),
quota_manager_proxy, std::move(additional_providers), auto_mounters,
base_path, CreateAllowFileAccessOptions());
}
@@ -68,7 +68,7 @@
base::ThreadTaskRunnerHandle::Get().get(),
base::ThreadTaskRunnerHandle::Get().get(),
storage::ExternalMountPoints::CreateRefCounted().get(),
- make_scoped_refptr(new MockSpecialStoragePolicy()).get(),
+ base::MakeRefCounted<MockSpecialStoragePolicy>().get(),
quota_manager_proxy,
std::vector<std::unique_ptr<storage::FileSystemBackend>>(),
std::vector<storage::URLRequestAutoMountHandler>(), base_path,
diff --git a/third_party/WebKit/Source/platform/scheduler/child/idle_helper.cc b/third_party/WebKit/Source/platform/scheduler/child/idle_helper.cc
index 0433b15..ca73dc7 100644
--- a/third_party/WebKit/Source/platform/scheduler/child/idle_helper.cc
+++ b/third_party/WebKit/Source/platform/scheduler/child/idle_helper.cc
@@ -37,7 +37,7 @@
&IdleHelper::OnIdleTaskPostedOnMainThread, weak_idle_helper_ptr_));
idle_task_runner_ =
- make_scoped_refptr(new SingleThreadIdleTaskRunner(idle_queue_, this));
+ base::MakeRefCounted<SingleThreadIdleTaskRunner>(idle_queue_, this);
// This fence will block any idle tasks from running.
idle_queue_->InsertFence(TaskQueue::InsertFencePosition::BEGINNING_OF_TIME);
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/budget_pool_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/budget_pool_unittest.cc
index ade141c..aa22be1 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/budget_pool_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/budget_pool_unittest.cc
@@ -35,7 +35,7 @@
clock_.reset(new base::SimpleTestTickClock());
clock_->Advance(base::TimeDelta::FromMicroseconds(5000));
mock_task_runner_ =
- make_scoped_refptr(new cc::OrderedSimpleTaskRunner(clock_.get(), true));
+ base::MakeRefCounted<cc::OrderedSimpleTaskRunner>(clock_.get(), true);
delegate_ = SchedulerTqmDelegateForTest::Create(
mock_task_runner_, base::MakeUnique<TestTimeSource>(clock_.get()));
scheduler_.reset(new RendererSchedulerImpl(delegate_));
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_metrics_helper_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_metrics_helper_unittest.cc
index bfeb1562..a214f23 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_metrics_helper_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_metrics_helper_unittest.cc
@@ -32,7 +32,7 @@
histogram_tester_.reset(new base::HistogramTester());
clock_ = base::MakeUnique<base::SimpleTestTickClock>();
mock_task_runner_ =
- make_scoped_refptr(new cc::OrderedSimpleTaskRunner(clock_.get(), true));
+ base::MakeRefCounted<cc::OrderedSimpleTaskRunner>(clock_.get(), true);
delegate_ = SchedulerTqmDelegateForTest::Create(
mock_task_runner_, base::MakeUnique<TestTimeSource>(clock_.get()));
scheduler_ = base::MakeUnique<RendererSchedulerImpl>(delegate_);
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc
index 9533f3d..6576ba3 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc
@@ -84,7 +84,7 @@
clock_ = CreateClock();
clock_->Advance(base::TimeDelta::FromMicroseconds(5000));
mock_task_runner_ =
- make_scoped_refptr(new cc::OrderedSimpleTaskRunner(clock_.get(), true));
+ base::MakeRefCounted<cc::OrderedSimpleTaskRunner>(clock_.get(), true);
delegate_ = SchedulerTqmDelegateForTest::Create(
mock_task_runner_, base::MakeUnique<TestTimeSource>(clock_.get()));
scheduler_.reset(new RendererSchedulerImpl(delegate_));
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/web_frame_scheduler_impl_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/web_frame_scheduler_impl_unittest.cc
index ea4b8f3..a7d3cb2 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/web_frame_scheduler_impl_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/web_frame_scheduler_impl_unittest.cc
@@ -31,7 +31,7 @@
clock_.reset(new base::SimpleTestTickClock());
clock_->Advance(base::TimeDelta::FromMicroseconds(5000));
mock_task_runner_ =
- make_scoped_refptr(new cc::OrderedSimpleTaskRunner(clock_.get(), true));
+ base::MakeRefCounted<cc::OrderedSimpleTaskRunner>(clock_.get(), true);
delegate_ = SchedulerTqmDelegateForTest::Create(
mock_task_runner_, base::WrapUnique(new TestTimeSource(clock_.get())));
scheduler_.reset(new RendererSchedulerImpl(delegate_));
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl_unittest.cc
index faa1610..8a40942 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl_unittest.cc
@@ -38,7 +38,7 @@
clock_.reset(new base::SimpleTestTickClock());
clock_->Advance(base::TimeDelta::FromMicroseconds(5000));
mock_task_runner_ =
- make_scoped_refptr(new cc::OrderedSimpleTaskRunner(clock_.get(), true));
+ base::MakeRefCounted<cc::OrderedSimpleTaskRunner>(clock_.get(), true);
delegate_ = SchedulerTqmDelegateForTest::Create(
mock_task_runner_, base::MakeUnique<TestTimeSource>(clock_.get()));
scheduler_.reset(new RendererSchedulerImpl(delegate_));
diff --git a/tools/battor_agent/battor_connection_impl.cc b/tools/battor_agent/battor_connection_impl.cc
index efda2e1..f4a386c 100644
--- a/tools/battor_agent/battor_connection_impl.cc
+++ b/tools/battor_agent/battor_connection_impl.cc
@@ -214,8 +214,7 @@
LogSerial(StringPrintf("(message) Starting read of up to %zu bytes.",
max_bytes_to_read));
- pending_read_buffer_ =
- make_scoped_refptr(new net::IOBuffer(max_bytes_to_read));
+ pending_read_buffer_ = base::MakeRefCounted<net::IOBuffer>(max_bytes_to_read);
io_handler_->Read(base::MakeUnique<device::ReceiveBuffer>(
pending_read_buffer_, static_cast<uint32_t>(max_bytes_to_read),
@@ -318,8 +317,7 @@
StringPrintf("(flush) Starting read (quiet period has lasted %f ms).",
quiet_period_duration.InMillisecondsF()));
- pending_read_buffer_ =
- make_scoped_refptr(new net::IOBuffer(kFlushBufferSize));
+ pending_read_buffer_ = base::MakeRefCounted<net::IOBuffer>(kFlushBufferSize);
io_handler_->Read(base::MakeUnique<device::ReceiveBuffer>(
pending_read_buffer_, static_cast<uint32_t>(kFlushBufferSize),
diff --git a/ui/base/cursor/ozone/cursor_data_factory_ozone.cc b/ui/base/cursor/ozone/cursor_data_factory_ozone.cc
index 3bcaf00..72df892d 100644
--- a/ui/base/cursor/ozone/cursor_data_factory_ozone.cc
+++ b/ui/base/cursor/ozone/cursor_data_factory_ozone.cc
@@ -97,7 +97,7 @@
// We hold a ref forever because clients do not do refcounting for default
// cursors.
scoped_refptr<CursorDataOzone> cursor =
- make_scoped_refptr(new CursorDataOzone(ui::CursorData(type)));
+ base::MakeRefCounted<CursorDataOzone>(ui::CursorData(type));
default_cursors_[type] = std::move(cursor);
}
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 08dc98b..0e46f3ea 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -976,7 +976,7 @@
gfx::Rect invalidation(
gfx::IntersectRects(paint_region_.bounds(), local_bounds));
paint_region_.Clear();
- auto display_list = make_scoped_refptr(new cc::DisplayItemList);
+ auto display_list = base::MakeRefCounted<cc::DisplayItemList>();
if (delegate_) {
delegate_->OnPaintLayer(PaintContext(display_list.get(),
device_scale_factor_, invalidation,
diff --git a/ui/display/manager/chromeos/touch_transform_controller_unittest.cc b/ui/display/manager/chromeos/touch_transform_controller_unittest.cc
index 2860c0855..cb707cc 100644
--- a/ui/display/manager/chromeos/touch_transform_controller_unittest.cc
+++ b/ui/display/manager/chromeos/touch_transform_controller_unittest.cc
@@ -715,12 +715,12 @@
ManagedDisplayInfo::ManagedDisplayModeList internal_modes;
- internal_modes.push_back(make_scoped_refptr(new ManagedDisplayMode(
+ internal_modes.push_back(base::MakeRefCounted<ManagedDisplayMode>(
gfx::Size(kNativeDisplaySize.width(), kNativeDisplaySize.height()), 60,
- false, true)));
- internal_modes.push_back(make_scoped_refptr(new ManagedDisplayMode(
+ false, true));
+ internal_modes.push_back(base::MakeRefCounted<ManagedDisplayMode>(
gfx::Size(kDisplaySize.width(), kDisplaySize.height()), 60, false,
- false)));
+ false));
internal_display_info.SetManagedDisplayModes(internal_modes);
ui::TouchscreenDevice internal_touchscreen =
@@ -788,12 +788,12 @@
ManagedDisplayInfo::ManagedDisplayModeList internal_modes;
- internal_modes.push_back(make_scoped_refptr(new ManagedDisplayMode(
+ internal_modes.push_back(base::MakeRefCounted<ManagedDisplayMode>(
gfx::Size(kNativeDisplaySize.width(), kNativeDisplaySize.height()), 60,
- false, true)));
- internal_modes.push_back(make_scoped_refptr(new ManagedDisplayMode(
+ false, true));
+ internal_modes.push_back(base::MakeRefCounted<ManagedDisplayMode>(
gfx::Size(kDisplaySize.width(), kDisplaySize.height()), 60, false,
- false)));
+ false));
internal_display_info.SetManagedDisplayModes(internal_modes);
ui::TouchscreenDevice internal_touchscreen =
diff --git a/ui/display/manager/display_manager.cc b/ui/display/manager/display_manager.cc
index b0ffb63c..e9de71e 100644
--- a/ui/display/manager/display_manager.cc
+++ b/ui/display/manager/display_manager.cc
@@ -1280,9 +1280,9 @@
});
scoped_refptr<ManagedDisplayMode> dm(*iter);
- *iter = make_scoped_refptr(new ManagedDisplayMode(
+ *iter = base::MakeRefCounted<ManagedDisplayMode>(
dm->size(), dm->refresh_rate(), dm->is_interlaced(),
- true /* native */, dm->ui_scale(), dm->device_scale_factor()));
+ true /* native */, dm->ui_scale(), dm->device_scale_factor());
info.SetManagedDisplayModes(modes);
info.set_device_scale_factor(dm->device_scale_factor());
diff --git a/ui/ozone/platform/cast/surface_factory_cast.cc b/ui/ozone/platform/cast/surface_factory_cast.cc
index 522a837c..28bd060 100644
--- a/ui/ozone/platform/cast/surface_factory_cast.cc
+++ b/ui/ozone/platform/cast/surface_factory_cast.cc
@@ -132,7 +132,7 @@
gfx::Size size,
gfx::BufferFormat format,
gfx::BufferUsage usage) {
- return make_scoped_refptr(new CastPixmap(egl_implementation_.get()));
+ return base::MakeRefCounted<CastPixmap>(egl_implementation_.get());
}
} // namespace ui
diff --git a/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc b/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc
index 7560a33..a347c94 100644
--- a/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc
@@ -156,7 +156,7 @@
if (!buffer.get())
return nullptr;
- return make_scoped_refptr(new GbmPixmap(this, buffer));
+ return base::MakeRefCounted<GbmPixmap>(this, buffer);
}
scoped_refptr<gfx::NativePixmap>
@@ -185,7 +185,7 @@
widget, size, format, std::move(scoped_fds), planes);
if (!buffer)
return nullptr;
- return make_scoped_refptr(new GbmPixmap(this, buffer));
+ return base::MakeRefCounted<GbmPixmap>(this, buffer);
}
} // namespace ui