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

4 files changed, 13 insertions, 12 deletions

diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.cc b/sync/internal_api/public/sessions/sync_session_snapshot.cc
index 8c0c2b9..03da223 100644
--- a/sync/internal_api/public/sessions/sync_session_snapshot.cc
+++ b/sync/internal_api/public/sessions/sync_session_snapshot.cc
@@ -53,8 +53,8 @@ SyncSessionSnapshot::SyncSessionSnapshot(
 
 SyncSessionSnapshot::~SyncSessionSnapshot() {}
 
-DictionaryValue* SyncSessionSnapshot::ToValue() const {
-  scoped_ptr<DictionaryValue> value(new DictionaryValue());
+base::DictionaryValue* SyncSessionSnapshot::ToValue() const {
+  scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetInteger("numSuccessfulCommits",
                     model_neutral_state_.num_successful_commits);
   value->SetInteger("numSuccessfulBookmarkCommits",
@@ -86,9 +86,10 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const {
   value->Set("source", source_.ToValue());
   value->SetBoolean("notificationsEnabled", notifications_enabled_);
 
-  scoped_ptr<DictionaryValue> counter_entries(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> counter_entries(
+      new base::DictionaryValue());
   for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; i++) {
-    scoped_ptr<DictionaryValue> type_entries(new DictionaryValue());
+    scoped_ptr<base::DictionaryValue> type_entries(new base::DictionaryValue());
     type_entries->SetInteger("numEntries", num_entries_by_type_[i]);
     type_entries->SetInteger("numToDeleteEntries",
                              num_to_delete_entries_by_type_[i]);
@@ -101,7 +102,7 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const {
 }
 
 std::string SyncSessionSnapshot::ToString() const {
-  scoped_ptr<DictionaryValue> value(ToValue());
+  scoped_ptr<base::DictionaryValue> value(ToValue());
   std::string json;
   base::JSONWriter::WriteWithOptions(value.get(),
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
diff --git a/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc b/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc
index 1d9f198..36056e3 100644
--- a/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc
+++ b/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc
@@ -36,7 +36,7 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) {
   ProgressMarkerMap download_progress_markers;
   download_progress_markers[BOOKMARKS] = "test";
   download_progress_markers[APPS] = "apps";
-  scoped_ptr<DictionaryValue> expected_download_progress_markers_value(
+  scoped_ptr<base::DictionaryValue> expected_download_progress_markers_value(
       ProgressMarkerMapToValue(download_progress_markers));
 
   const bool kIsSilenced = true;
@@ -45,7 +45,7 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) {
   const int kNumServerConflicts = 1057;
 
   SyncSourceInfo source;
-  scoped_ptr<DictionaryValue> expected_source_value(source.ToValue());
+  scoped_ptr<base::DictionaryValue> expected_source_value(source.ToValue());
 
   SyncSessionSnapshot snapshot(model_neutral,
                                download_progress_markers,
@@ -59,7 +59,7 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) {
                                base::Time::Now(),
                                std::vector<int>(MODEL_TYPE_COUNT,0),
                                std::vector<int>(MODEL_TYPE_COUNT, 0));
-  scoped_ptr<DictionaryValue> value(snapshot.ToValue());
+  scoped_ptr<base::DictionaryValue> value(snapshot.ToValue());
   EXPECT_EQ(17u, value->size());
   ExpectDictIntegerValue(model_neutral.num_successful_commits,
                          *value, "numSuccessfulCommits");
diff --git a/sync/internal_api/public/sessions/sync_source_info.cc b/sync/internal_api/public/sessions/sync_source_info.cc
index c3b08d1..5c05de6 100644
--- a/sync/internal_api/public/sessions/sync_source_info.cc
+++ b/sync/internal_api/public/sessions/sync_source_info.cc
@@ -23,8 +23,8 @@ SyncSourceInfo::SyncSourceInfo(
 
 SyncSourceInfo::~SyncSourceInfo() {}
 
-DictionaryValue* SyncSourceInfo::ToValue() const {
-  DictionaryValue* value = new DictionaryValue();
+base::DictionaryValue* SyncSourceInfo::ToValue() const {
+  base::DictionaryValue* value = new base::DictionaryValue();
   value->SetString("updatesSource",
                    GetUpdatesSourceString(updates_source));
   value->Set("types", ModelTypeInvalidationMapToValue(types));
diff --git a/sync/internal_api/public/sessions/sync_source_info_unittest.cc b/sync/internal_api/public/sessions/sync_source_info_unittest.cc
index 8769e8e..cbdecf17 100644
--- a/sync/internal_api/public/sessions/sync_source_info_unittest.cc
+++ b/sync/internal_api/public/sessions/sync_source_info_unittest.cc
@@ -26,12 +26,12 @@ TEST_F(SyncSourceInfoTest, SyncSourceInfoToValue) {
   ModelTypeInvalidationMap types;
   types[PREFERENCES].payload = "preferencespayload";
   types[EXTENSIONS].payload = "";
-  scoped_ptr<DictionaryValue> expected_types_value(
+  scoped_ptr<base::DictionaryValue> expected_types_value(
       ModelTypeInvalidationMapToValue(types));
 
   SyncSourceInfo source_info(updates_source, types);
 
-  scoped_ptr<DictionaryValue> value(source_info.ToValue());
+  scoped_ptr<base::DictionaryValue> value(source_info.ToValue());
   EXPECT_EQ(2u, value->size());
   ExpectDictStringValue("PERIODIC", *value, "updatesSource");
   ExpectDictDictionaryValue(*expected_types_value, *value, "types");