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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/storage/settings_sync_unittest.cc

Issue 2777063003: Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions (Closed)
Patch Set: Just rebased Created 3 years, 8 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
« chrome/browser/extensions/api/proxy/proxy_api.cc ('K') | « chrome/browser/extensions/api/storage/policy_value_store.cc ('k') | chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7ac4ca57e9e6134b5e5aba8a010f068c2f562d62..d44e0e2ac78bc5388f688afc5f21101ccf6bfd71 100644
--- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
+++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
@@ -15,6 +15,7 @@
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
+#include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/api/storage/settings_sync_util.h"
#include "chrome/browser/extensions/api/storage/sync_value_store_cache.h"
@@ -402,8 +403,8 @@ TEST_F(ExtensionSettingsSyncTest, AnySyncDataOverwritesLocalData) {
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
base::MakeUnique<syncer::SyncErrorFactoryMock>());
- expected1.Set("foo", value1.DeepCopy());
- expected2.Set("bar", value2.DeepCopy());
+ expected1.Set("foo", value1.CreateDeepCopy());
+ expected2.Set("bar", value2.CreateDeepCopy());
ValueStore* storage2 = AddExtensionAndGetStorage("s2", type);
@@ -434,7 +435,7 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
ValueStore* storage2 = AddExtensionAndGetStorage("s2", type);
storage1->Set(DEFAULTS, "foo", value1);
- expected1.Set("foo", value1.DeepCopy());
+ expected1.Set("foo", value1.CreateDeepCopy());
syncer::SyncDataList sync_data;
sync_data.push_back(settings_sync_util::CreateData(
@@ -444,7 +445,7 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
base::MakeUnique<syncer::SyncErrorFactoryMock>());
- expected2.Set("bar", value2.DeepCopy());
+ expected2.Set("bar", value2.CreateDeepCopy());
// Make sync add some settings.
syncer::SyncChangeList change_list;
@@ -453,8 +454,8 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
change_list.push_back(settings_sync_util::CreateAdd(
"s2", "foo", value1, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
- expected1.Set("bar", value2.DeepCopy());
- expected2.Set("foo", value1.DeepCopy());
+ expected1.Set("bar", value2.CreateDeepCopy());
+ expected2.Set("foo", value1.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, expected1, storage1->Get());
EXPECT_PRED_FORMAT2(SettingsEq, expected2, storage2->Get());
@@ -467,8 +468,8 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
change_list.push_back(settings_sync_util::CreateUpdate(
"s2", "bar", value1, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
- expected1.Set("bar", value2.DeepCopy());
- expected2.Set("bar", value1.DeepCopy());
+ expected1.Set("bar", value2.CreateDeepCopy());
+ expected2.Set("bar", value1.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, expected1, storage1->Get());
EXPECT_PRED_FORMAT2(SettingsEq, expected2, storage2->Get());
@@ -707,7 +708,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", fooValue.DeepCopy());
+ dict.Set("foo", fooValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
@@ -726,13 +727,13 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", fooValue.DeepCopy());
- dict.Set("bar", barValue.DeepCopy());
+ dict.Set("foo", fooValue.CreateDeepCopy());
+ dict.Set("bar", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
base::DictionaryValue dict;
- dict.Set("bar", barValue.DeepCopy());
+ dict.Set("bar", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
}
@@ -751,13 +752,13 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", barValue.DeepCopy());
- dict.Set("bar", barValue.DeepCopy());
+ dict.Set("foo", barValue.CreateDeepCopy());
+ dict.Set("bar", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
base::DictionaryValue dict;
- dict.Set("bar", barValue.DeepCopy());
+ dict.Set("bar", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
}
@@ -773,13 +774,13 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", barValue.DeepCopy());
- dict.Set("bar", fooValue.DeepCopy());
+ dict.Set("foo", barValue.CreateDeepCopy());
+ dict.Set("bar", fooValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
base::DictionaryValue dict;
- dict.Set("bar", fooValue.DeepCopy());
+ dict.Set("bar", fooValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
}
@@ -798,13 +799,13 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", fooValue.DeepCopy());
- dict.Set("bar", fooValue.DeepCopy());
+ dict.Set("foo", fooValue.CreateDeepCopy());
+ dict.Set("bar", fooValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
base::DictionaryValue dict;
- dict.Set("bar", fooValue.DeepCopy());
+ dict.Set("bar", fooValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
}
@@ -852,13 +853,13 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", fooValue.DeepCopy());
- dict.Set("bar", fooValue.DeepCopy());
+ dict.Set("foo", fooValue.CreateDeepCopy());
+ dict.Set("bar", fooValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
base::DictionaryValue dict;
- dict.Set("bar", fooValue.DeepCopy());
+ dict.Set("bar", fooValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
}
}
@@ -892,12 +893,12 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", fooValue.DeepCopy());
+ dict.Set("foo", fooValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
base::DictionaryValue dict;
- dict.Set("foo", fooValue.DeepCopy());
+ dict.Set("foo", fooValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
}
@@ -915,13 +916,13 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", fooValue.DeepCopy());
- dict.Set("bar", barValue.DeepCopy());
+ dict.Set("foo", fooValue.CreateDeepCopy());
+ dict.Set("bar", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
base::DictionaryValue dict;
- dict.Set("foo", fooValue.DeepCopy());
+ dict.Set("foo", fooValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
}
@@ -946,13 +947,13 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", fooValue.DeepCopy());
- dict.Set("bar", barValue.DeepCopy());
+ dict.Set("foo", fooValue.CreateDeepCopy());
+ dict.Set("bar", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
base::DictionaryValue dict;
- dict.Set("foo", barValue.DeepCopy());
+ dict.Set("foo", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
}
}
@@ -1054,14 +1055,14 @@ TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", barValue.DeepCopy());
- dict.Set("bar", barValue.DeepCopy());
+ dict.Set("foo", barValue.CreateDeepCopy());
+ dict.Set("bar", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
base::DictionaryValue dict;
- dict.Set("foo", fooValue.DeepCopy());
- dict.Set("bar", barValue.DeepCopy());
+ dict.Set("foo", fooValue.CreateDeepCopy());
+ dict.Set("bar", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
}
@@ -1140,13 +1141,13 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalStateDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", barValue.DeepCopy());
- dict.Set("bar", barValue.DeepCopy());
+ dict.Set("foo", barValue.CreateDeepCopy());
+ dict.Set("bar", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
base::DictionaryValue dict;
- dict.Set("foo", barValue.DeepCopy());
+ dict.Set("foo", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
}
@@ -1227,13 +1228,13 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) {
{
base::DictionaryValue dict;
- dict.Set("foo", barValue.DeepCopy());
- dict.Set("bar", barValue.DeepCopy());
+ dict.Set("foo", barValue.CreateDeepCopy());
+ dict.Set("bar", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
}
{
base::DictionaryValue dict;
- dict.Set("foo", barValue.DeepCopy());
+ dict.Set("foo", barValue.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
}
@@ -1303,7 +1304,7 @@ TEST_F(ExtensionSettingsSyncTest,
}
{
base::DictionaryValue expected;
- expected.Set("large_value", large_value.DeepCopy());
+ expected.Set("large_value", large_value.CreateDeepCopy());
EXPECT_PRED_FORMAT2(SettingsEq, expected, storage1->Get());
EXPECT_PRED_FORMAT2(SettingsEq, expected, storage2->Get());
}
@@ -1335,8 +1336,8 @@ TEST_F(ExtensionSettingsSyncTest, Dots) {
ASSERT_TRUE(data->status().ok());
base::DictionaryValue expected_data;
- expected_data.SetWithoutPathExpansion("key.with.dot",
- new base::Value("value"));
+ expected_data.SetWithoutPathExpansion(
+ "key.with.dot", base::MakeUnique<base::Value>("value"));
EXPECT_TRUE(base::Value::Equals(&expected_data, &data->settings()));
}
« chrome/browser/extensions/api/proxy/proxy_api.cc ('K') | « chrome/browser/extensions/api/storage/policy_value_store.cc ('k') | chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698