diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 19:42:19 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 19:42:19 +0000 |
| commit | 0c6c1e43289fc2e225a6c824aff40c9b63b5df78 (patch) | |
| tree | 9ab1034e260c5887ecc7a70cd112cef97458582a /sync/api | |
| parent | ae0c0f6af00c25b6c41c9e37e8cb849de9a9a680 (diff) | |
| download | chromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.zip chromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.tar.gz chromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.tar.bz2 | |
Add base namespace to more values in sync and elsewhere.
This makes sync and net compile with no "using *Value".
BUG=
Review URL: https://codereview.chromium.org/17034006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/api')
| -rw-r--r-- | sync/api/sync_change_unittest.cc | 12 | ||||
| -rw-r--r-- | sync/api/sync_data.cc | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sync/api/sync_change_unittest.cc b/sync/api/sync_change_unittest.cc index b989e41..4c23c77 100644 --- a/sync/api/sync_change_unittest.cc +++ b/sync/api/sync_change_unittest.cc @@ -47,8 +47,8 @@ TEST_F(SyncChangeTest, LocalUpdate) { EXPECT_EQ(tag, e.sync_data().GetTag()); EXPECT_EQ(title, e.sync_data().GetTitle()); EXPECT_EQ(PREFERENCES, e.sync_data().GetDataType()); - scoped_ptr<DictionaryValue> ref_spec(EntitySpecificsToValue(specifics)); - scoped_ptr<DictionaryValue> e_spec(EntitySpecificsToValue( + scoped_ptr<base::DictionaryValue> ref_spec(EntitySpecificsToValue(specifics)); + scoped_ptr<base::DictionaryValue> e_spec(EntitySpecificsToValue( e.sync_data().GetSpecifics())); EXPECT_TRUE(ref_spec->Equals(e_spec.get())); } @@ -67,8 +67,8 @@ TEST_F(SyncChangeTest, LocalAdd) { EXPECT_EQ(tag, e.sync_data().GetTag()); EXPECT_EQ(title, e.sync_data().GetTitle()); EXPECT_EQ(PREFERENCES, e.sync_data().GetDataType()); - scoped_ptr<DictionaryValue> ref_spec(EntitySpecificsToValue(specifics)); - scoped_ptr<DictionaryValue> e_spec(EntitySpecificsToValue( + scoped_ptr<base::DictionaryValue> ref_spec(EntitySpecificsToValue(specifics)); + scoped_ptr<base::DictionaryValue> e_spec(EntitySpecificsToValue( e.sync_data().GetSpecifics())); EXPECT_TRUE(ref_spec->Equals(e_spec.get())); } @@ -110,9 +110,9 @@ TEST_F(SyncChangeTest, SyncerChanges) { SyncChange e = change_list[0]; EXPECT_EQ(SyncChange::ACTION_UPDATE, e.change_type()); EXPECT_EQ(PREFERENCES, e.sync_data().GetDataType()); - scoped_ptr<DictionaryValue> ref_spec(EntitySpecificsToValue( + scoped_ptr<base::DictionaryValue> ref_spec(EntitySpecificsToValue( update_specifics)); - scoped_ptr<DictionaryValue> e_spec(EntitySpecificsToValue( + scoped_ptr<base::DictionaryValue> e_spec(EntitySpecificsToValue( e.sync_data().GetSpecifics())); EXPECT_TRUE(ref_spec->Equals(e_spec.get())); diff --git a/sync/api/sync_data.cc b/sync/api/sync_data.cc index e95a2df..8df5eae 100644 --- a/sync/api/sync_data.cc +++ b/sync/api/sync_data.cc @@ -121,7 +121,8 @@ std::string SyncData::ToString() const { std::string type = ModelTypeToString(GetDataType()); std::string specifics; - scoped_ptr<DictionaryValue> value(EntitySpecificsToValue(GetSpecifics())); + scoped_ptr<base::DictionaryValue> value( + EntitySpecificsToValue(GetSpecifics())); base::JSONWriter::WriteWithOptions(value.get(), base::JSONWriter::OPTIONS_PRETTY_PRINT, &specifics); |