Index: chrome/browser/extensions/api/storage/settings_sync_unittest.cc |
diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc |
index c35a85d063f97a6900858af03ea23d8bd54d06c1..0e27331cbdc7a50ec5c0180af72855ecb552f174 100644 |
--- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc |
+++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc |
@@ -11,7 +11,6 @@ |
#include "base/files/scoped_temp_dir.h" |
#include "base/json/json_reader.h" |
#include "base/json/json_writer.h" |
-#include "base/memory/linked_ptr.h" |
#include "base/memory/ptr_util.h" |
#include "base/message_loop/message_loop.h" |
#include "base/run_loop.h" |
@@ -54,7 +53,7 @@ const ValueStore::WriteOptions DEFAULTS = ValueStore::DEFAULTS; |
// More saving typing. Maps extension IDs to a list of sync changes for that |
// extension. |
using SettingSyncDataMultimap = |
- std::map<std::string, linked_ptr<SettingSyncDataList>>; |
+ std::map<std::string, std::unique_ptr<SettingSyncDataList>>; |
// Gets the pretty-printed JSON for a value. |
static std::string GetJson(const base::Value& value) { |
@@ -120,7 +119,7 @@ class MockSyncChangeProcessor : public syncer::SyncChangeProcessor { |
} |
for (syncer::SyncChangeList::const_iterator it = change_list.begin(); |
it != change_list.end(); ++it) { |
- changes_.push_back(new SettingSyncData(*it)); |
+ changes_.push_back(base::MakeUnique<SettingSyncData>(*it)); |
} |
return syncer::SyncError(); |
} |
@@ -146,11 +145,9 @@ class MockSyncChangeProcessor : public syncer::SyncChangeProcessor { |
SettingSyncData* GetOnlyChange(const std::string& extension_id, |
const std::string& key) { |
std::vector<SettingSyncData*> matching_changes; |
- for (SettingSyncDataList::iterator it = changes_.begin(); |
- it != changes_.end(); ++it) { |
- if ((*it)->extension_id() == extension_id && (*it)->key() == key) { |
- matching_changes.push_back(*it); |
- } |
+ for (const std::unique_ptr<SettingSyncData>& change : changes_) { |
+ if (change->extension_id() == extension_id && change->key() == key) |
+ matching_changes.push_back(change.get()); |
} |
if (matching_changes.empty()) { |
ADD_FAILURE() << "No matching changes for " << extension_id << "/" << |
@@ -240,12 +237,12 @@ class ExtensionSettingsSyncTest : public testing::Test { |
SettingSyncDataMultimap as_map; |
for (syncer::SyncDataList::iterator it = as_list.begin(); |
it != as_list.end(); ++it) { |
- SettingSyncData* sync_data = new SettingSyncData(*it); |
- linked_ptr<SettingSyncDataList>& list_for_extension = |
+ std::unique_ptr<SettingSyncData> sync_data(new SettingSyncData(*it)); |
+ std::unique_ptr<SettingSyncDataList>& list_for_extension = |
as_map[sync_data->extension_id()]; |
- if (!list_for_extension.get()) |
+ if (!list_for_extension) |
list_for_extension.reset(new SettingSyncDataList()); |
- list_for_extension->push_back(sync_data); |
+ list_for_extension->push_back(std::move(sync_data)); |
} |
return as_map; |
} |
@@ -1350,7 +1347,7 @@ TEST_F(ExtensionSettingsSyncTest, Dots) { |
storage->Set(DEFAULTS, "key.with.spot", *string_value); |
ASSERT_EQ(1u, sync_processor_->changes().size()); |
- SettingSyncData* sync_data = sync_processor_->changes()[0]; |
+ SettingSyncData* sync_data = sync_processor_->changes()[0].get(); |
EXPECT_EQ(syncer::SyncChange::ACTION_ADD, sync_data->change_type()); |
EXPECT_EQ("ext", sync_data->extension_id()); |
EXPECT_EQ("key.with.spot", sync_data->key()); |