Add base namespace to more values in sync and elsewhere.

sync/internal_api/public/sessions/sync_session_snapshot.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
@@ skipping 35 matching lines @@
       notifications_enabled_(notifications_enabled),
       num_entries_(num_entries),
       sync_start_time_(sync_start_time),
       num_entries_by_type_(num_entries_by_type),
       num_to_delete_entries_by_type_(num_to_delete_entries_by_type),
       is_initialized_(true) {
 }
 
 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",
                 model_neutral_state_.num_successful_bookmark_commits);
   value->SetInteger("numUpdatesDownloadedTotal",
                 model_neutral_state_.num_updates_downloaded_total);
   value->SetInteger("numTombstoneUpdatesDownloadedTotal",
                 model_neutral_state_.num_tombstone_updates_downloaded_total);
   value->SetInteger("numReflectedUpdatesDownloadedTotal",
                 model_neutral_state_.num_reflected_updates_downloaded_total);
@@ skipping 11 matching lines @@
   value->SetInteger("numEncryptionConflicts",
                     num_encryption_conflicts_);
   value->SetInteger("numHierarchyConflicts",
                     num_hierarchy_conflicts_);
   value->SetInteger("numServerConflicts",
                     num_server_conflicts_);
   value->SetInteger("numEntries", num_entries_);
   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]);
 
     const std::string model_type = ModelTypeToString(static_cast<ModelType>(i));
     counter_entries->Set(model_type, type_entries.release());
   }
   value->Set("counter_entries", counter_entries.release());
   return value.release();
 }
 
 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,
                                      &json);
   return json;
 }
 
 int64 SyncSessionSnapshot::num_server_changes_remaining() const {
   return model_neutral_state().num_server_changes_remaining;
 }
@@ skipping 43 matching lines @@
   return num_entries_by_type_;
 }
 
 const std::vector<int>&
 SyncSessionSnapshot::num_to_delete_entries_by_type() const {
   return num_to_delete_entries_by_type_;
 }
 
 }  // namespace sessions
 }  // namespace syncer