Add base namespace to more values in sync and elsewhere.

sync/protocol/proto_value_conversions_unittest.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.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "sync/protocol/proto_value_conversions.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 24 matching lines @@
 #include "sync/protocol/typed_url_specifics.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 namespace {
 
 class ProtoValueConversionsTest : public testing::Test {
  protected:
   template <class T>
   void TestSpecificsToValue(
-      DictionaryValue* (*specifics_to_value)(const T&)) {
+      base::DictionaryValue* (*specifics_to_value)(const T&)) {
     const T& specifics(T::default_instance());
-    scoped_ptr<DictionaryValue> value(specifics_to_value(specifics));
+    scoped_ptr<base::DictionaryValue> value(specifics_to_value(specifics));
     // We can't do much but make sure that this doesn't crash.
   }
 };
 
 TEST_F(ProtoValueConversionsTest, ProtoChangeCheck) {
   // If this number changes, that means we added or removed a data
   // type.  Don't forget to add a unit test for {New
   // type}SpecificsToValue below.
   EXPECT_EQ(28, MODEL_TYPE_COUNT);
 
@@ skipping 20 matching lines @@
   TestSpecificsToValue(SessionWindowToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, TabNavigationToValue) {
   TestSpecificsToValue(TabNavigationToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, PasswordSpecificsData) {
   sync_pb::PasswordSpecificsData specifics;
   specifics.set_password_value("secret");
-  scoped_ptr<DictionaryValue> value(PasswordSpecificsDataToValue(specifics));
+  scoped_ptr<base::DictionaryValue> value(
+      PasswordSpecificsDataToValue(specifics));
   EXPECT_FALSE(value->empty());
   std::string password_value;
   EXPECT_TRUE(value->GetString("password_value", &password_value));
   EXPECT_EQ("<redacted>", password_value);
 }
 
 TEST_F(ProtoValueConversionsTest, AppNotificationToValue) {
   TestSpecificsToValue(AppNotificationToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, AppSettingSpecificsToValue) {
   sync_pb::AppNotificationSettings specifics;
   specifics.set_disabled(true);
   specifics.set_oauth_client_id("some_id_value");
-  scoped_ptr<DictionaryValue> value(AppSettingsToValue(specifics));
+  scoped_ptr<base::DictionaryValue> value(AppSettingsToValue(specifics));
   EXPECT_FALSE(value->empty());
   bool disabled_value = false;
   std::string oauth_client_id_value;
   EXPECT_TRUE(value->GetBoolean("disabled", &disabled_value));
   EXPECT_EQ(true, disabled_value);
   EXPECT_TRUE(value->GetString("oauth_client_id", &oauth_client_id_value));
   EXPECT_EQ("some_id_value", oauth_client_id_value);
 }
 
 TEST_F(ProtoValueConversionsTest, AppSpecificsToValue) {
@@ skipping 11 matching lines @@
 TEST_F(ProtoValueConversionsTest, BookmarkSpecificsToValue) {
   TestSpecificsToValue(BookmarkSpecificsToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, BookmarkSpecificsData) {
   const base::Time creation_time(base::Time::Now());
   const std::string icon_url = "http://www.google.com/favicon.ico";
   sync_pb::BookmarkSpecifics specifics;
   specifics.set_creation_time_us(creation_time.ToInternalValue());
   specifics.set_icon_url(icon_url);
-  scoped_ptr<DictionaryValue> value(BookmarkSpecificsToValue(specifics));
+  scoped_ptr<base::DictionaryValue> value(BookmarkSpecificsToValue(specifics));
   EXPECT_FALSE(value->empty());
   std::string encoded_time;
   EXPECT_TRUE(value->GetString("creation_time_us", &encoded_time));
   EXPECT_EQ(base::Int64ToString(creation_time.ToInternalValue()), encoded_time);
   std::string encoded_icon_url;
   EXPECT_TRUE(value->GetString("icon_url", &encoded_icon_url));
   EXPECT_EQ(icon_url, encoded_icon_url);
 }
 
 TEST_F(ProtoValueConversionsTest, PriorityPreferenceSpecificsToValue) {
@@ skipping 101 matching lines @@
   SET_FIELD(preference);
   SET_FIELD(priority_preference);
   SET_FIELD(search_engine);
   SET_FIELD(session);
   SET_FIELD(synced_notification);
   SET_FIELD(theme);
   SET_FIELD(typed_url);
 
 #undef SET_FIELD
 
-  scoped_ptr<DictionaryValue> value(EntitySpecificsToValue(specifics));
+  scoped_ptr<base::DictionaryValue> value(EntitySpecificsToValue(specifics));
   EXPECT_EQ(MODEL_TYPE_COUNT - FIRST_REAL_MODEL_TYPE -
             (LAST_PROXY_TYPE - FIRST_PROXY_TYPE + 1),
             static_cast<int>(value->size()));
 }
 
 namespace {
 // Returns whether the given value has specifics under the entries in the given
 // path.
-bool ValueHasSpecifics(const DictionaryValue& value,
+bool ValueHasSpecifics(const base::DictionaryValue& value,
                        const std::string& path) {
-  const ListValue* entities_list = NULL;
-  const DictionaryValue* entry_dictionary = NULL;
-  const DictionaryValue* specifics_dictionary = NULL;
+  const base::ListValue* entities_list = NULL;
+  const base::DictionaryValue* entry_dictionary = NULL;
+  const base::DictionaryValue* specifics_dictionary = NULL;
 
   if (!value.GetList(path, &entities_list))
     return false;
 
   if (!entities_list->GetDictionary(0, &entry_dictionary))
     return false;
 
   return entry_dictionary->GetDictionary("specifics",
                                          &specifics_dictionary);
 }
 }  // namespace
 
 // Create a ClientToServerMessage with an EntitySpecifics.  Converting it to
 // a value should respect the |include_specifics| flag.
 TEST_F(ProtoValueConversionsTest, ClientToServerMessageToValue) {
   sync_pb::ClientToServerMessage message;
   sync_pb::CommitMessage* commit_message = message.mutable_commit();
   sync_pb::SyncEntity* entity = commit_message->add_entries();
   entity->mutable_specifics();
 
-  scoped_ptr<DictionaryValue> value_with_specifics(
+  scoped_ptr<base::DictionaryValue> value_with_specifics(
       ClientToServerMessageToValue(message, true /* include_specifics */));
   EXPECT_FALSE(value_with_specifics->empty());
   EXPECT_TRUE(ValueHasSpecifics(*(value_with_specifics.get()),
                                 "commit.entries"));
 
-  scoped_ptr<DictionaryValue> value_without_specifics(
+  scoped_ptr<base::DictionaryValue> value_without_specifics(
       ClientToServerMessageToValue(message, false /* include_specifics */));
   EXPECT_FALSE(value_without_specifics->empty());
   EXPECT_FALSE(ValueHasSpecifics(*(value_without_specifics.get()),
                                  "commit.entries"));
 }
 
 // Create a ClientToServerResponse with an EntitySpecifics.  Converting it to
 // a value should respect the |include_specifics| flag.
 TEST_F(ProtoValueConversionsTest, ClientToServerResponseToValue) {
   sync_pb::ClientToServerResponse message;
   sync_pb::GetUpdatesResponse* response = message.mutable_get_updates();
   sync_pb::SyncEntity* entity = response->add_entries();
   entity->mutable_specifics();
 
-  scoped_ptr<DictionaryValue> value_with_specifics(
+  scoped_ptr<base::DictionaryValue> value_with_specifics(
       ClientToServerResponseToValue(message, true /* include_specifics */));
   EXPECT_FALSE(value_with_specifics->empty());
   EXPECT_TRUE(ValueHasSpecifics(*(value_with_specifics.get()),
                                 "get_updates.entries"));
 
-  scoped_ptr<DictionaryValue> value_without_specifics(
+  scoped_ptr<base::DictionaryValue> value_without_specifics(
       ClientToServerResponseToValue(message, false /* include_specifics */));
   EXPECT_FALSE(value_without_specifics->empty());
   EXPECT_FALSE(ValueHasSpecifics(*(value_without_specifics.get()),
                                  "get_updates.entries"));
 }
 
 }  // namespace
 }  // namespace syncer