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

Unified Diff: extensions/browser/api/alarms/alarms_api_unittest.cc

Issue 2294653002: Some linked_ptr -> unique_ptr conversion in extensions/browser. (Closed)
Patch Set: address comments Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/alarms/alarms_api_unittest.cc
diff --git a/extensions/browser/api/alarms/alarms_api_unittest.cc b/extensions/browser/api/alarms/alarms_api_unittest.cc
index 299f3eb3f71e2926978b94c642b259d62dbb84fc..5387d0411817c6bd50b279e83da7c19246c1ab06 100644
--- a/extensions/browser/api/alarms/alarms_api_unittest.cc
+++ b/extensions/browser/api/alarms/alarms_api_unittest.cc
@@ -75,17 +75,17 @@ class ExtensionAlarmsTest : public ApiUnitTest {
// Takes a JSON result from a function and converts it to a vector of
// JsAlarms.
- std::vector<linked_ptr<JsAlarm>> ToAlarmList(base::ListValue* value) {
- std::vector<linked_ptr<JsAlarm>> list;
+ std::vector<std::unique_ptr<JsAlarm>> ToAlarmList(base::ListValue* value) {
+ std::vector<std::unique_ptr<JsAlarm>> list;
for (size_t i = 0; i < value->GetSize(); ++i) {
- linked_ptr<JsAlarm> alarm(new JsAlarm);
+ std::unique_ptr<JsAlarm> alarm(new JsAlarm());
base::DictionaryValue* alarm_value;
if (!value->GetDictionary(i, &alarm_value)) {
ADD_FAILURE() << "Expected a list of Alarm objects.";
return list;
}
EXPECT_TRUE(JsAlarm::Populate(*alarm_value, alarm.get()));
- list.push_back(alarm);
+ list.push_back(std::move(alarm));
}
return list;
}
@@ -366,7 +366,7 @@ TEST_F(ExtensionAlarmsTest, GetAll) {
{
std::unique_ptr<base::ListValue> result(
RunFunctionAndReturnList(new AlarmsGetAllFunction(), "[]"));
- std::vector<linked_ptr<JsAlarm>> alarms = ToAlarmList(result.get());
+ std::vector<std::unique_ptr<JsAlarm>> alarms = ToAlarmList(result.get());
EXPECT_EQ(0u, alarms.size());
}
@@ -376,7 +376,7 @@ TEST_F(ExtensionAlarmsTest, GetAll) {
{
std::unique_ptr<base::ListValue> result(
RunFunctionAndReturnList(new AlarmsGetAllFunction(), "[null]"));
- std::vector<linked_ptr<JsAlarm>> alarms = ToAlarmList(result.get());
+ std::vector<std::unique_ptr<JsAlarm>> alarms = ToAlarmList(result.get());
EXPECT_EQ(2u, alarms.size());
// Test the "7" alarm.
« no previous file with comments | « chrome/browser/extensions/external_provider_impl_unittest.cc ('k') | extensions/browser/api/api_resource_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698