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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/bookmarks/bookmark_codec_unittest.cc

Issue 106433007: Update some uses of Value in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years 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
« no previous file with comments | « chrome/browser/bookmarks/bookmark_codec.cc ('k') | chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_codec_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
index 98356e87e839e0ca2e0dc130551771a012dd1ff4..c1022f8d698eb7eeb16b19978cf0f9e36b17e631 100644
--- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
@@ -93,43 +93,46 @@ class BookmarkCodecTest : public testing::Test {
return model.release();
}
- void GetBookmarksBarChildValue(Value* value,
+ void GetBookmarksBarChildValue(base::Value* value,
size_t index,
- DictionaryValue** result_value) {
- ASSERT_EQ(Value::TYPE_DICTIONARY, value->GetType());
+ base::DictionaryValue** result_value) {
+ ASSERT_EQ(base::Value::TYPE_DICTIONARY, value->GetType());
- DictionaryValue* d_value = static_cast<DictionaryValue*>(value);
- Value* roots;
+ base::DictionaryValue* d_value = static_cast<base::DictionaryValue*>(value);
+ base::Value* roots;
ASSERT_TRUE(d_value->Get(BookmarkCodec::kRootsKey, &roots));
- ASSERT_EQ(Value::TYPE_DICTIONARY, roots->GetType());
+ ASSERT_EQ(base::Value::TYPE_DICTIONARY, roots->GetType());
- DictionaryValue* roots_d_value = static_cast<DictionaryValue*>(roots);
- Value* bb_value;
+ base::DictionaryValue* roots_d_value =
+ static_cast<base::DictionaryValue*>(roots);
+ base::Value* bb_value;
ASSERT_TRUE(roots_d_value->Get(BookmarkCodec::kRootFolderNameKey,
&bb_value));
- ASSERT_EQ(Value::TYPE_DICTIONARY, bb_value->GetType());
+ ASSERT_EQ(base::Value::TYPE_DICTIONARY, bb_value->GetType());
- DictionaryValue* bb_d_value = static_cast<DictionaryValue*>(bb_value);
- Value* bb_children_value;
+ base::DictionaryValue* bb_d_value =
+ static_cast<base::DictionaryValue*>(bb_value);
+ base::Value* bb_children_value;
ASSERT_TRUE(bb_d_value->Get(BookmarkCodec::kChildrenKey,
&bb_children_value));
- ASSERT_EQ(Value::TYPE_LIST, bb_children_value->GetType());
+ ASSERT_EQ(base::Value::TYPE_LIST, bb_children_value->GetType());
- ListValue* bb_children_l_value = static_cast<ListValue*>(bb_children_value);
- Value* child_value;
+ base::ListValue* bb_children_l_value =
+ static_cast<base::ListValue*>(bb_children_value);
+ base::Value* child_value;
ASSERT_TRUE(bb_children_l_value->Get(index, &child_value));
- ASSERT_EQ(Value::TYPE_DICTIONARY, child_value->GetType());
+ ASSERT_EQ(base::Value::TYPE_DICTIONARY, child_value->GetType());
- *result_value = static_cast<DictionaryValue*>(child_value);
+ *result_value = static_cast<base::DictionaryValue*>(child_value);
}
- Value* EncodeHelper(BookmarkModel* model, std::string* checksum) {
+ base::Value* EncodeHelper(BookmarkModel* model, std::string* checksum) {
BookmarkCodec encoder;
// Computed and stored checksums should be empty.
EXPECT_EQ("", encoder.computed_checksum());
EXPECT_EQ("", encoder.stored_checksum());
- scoped_ptr<Value> value(encoder.Encode(model));
+ scoped_ptr<base::Value> value(encoder.Encode(model));
const std::string& computed_checksum = encoder.computed_checksum();
const std::string& stored_checksum = encoder.stored_checksum();
@@ -142,7 +145,9 @@ class BookmarkCodecTest : public testing::Test {
return value.release();
}
- bool Decode(BookmarkCodec* codec, BookmarkModel* model, const Value& value) {
+ bool Decode(BookmarkCodec* codec,
+ BookmarkModel* model,
+ const base::Value& value) {
int64 max_id;
bool result = codec->Decode(AsMutable(model->bookmark_bar_node()),
AsMutable(model->other_node()),
@@ -157,7 +162,7 @@ class BookmarkCodecTest : public testing::Test {
return result;
}
- BookmarkModel* DecodeHelper(const Value& value,
+ BookmarkModel* DecodeHelper(const base::Value& value,
const std::string& expected_stored_checksum,
std::string* computed_checksum,
bool expected_changes) {
@@ -209,7 +214,8 @@ class BookmarkCodecTest : public testing::Test {
TEST_F(BookmarkCodecTest, ChecksumEncodeDecodeTest) {
scoped_ptr<BookmarkModel> model_to_encode(CreateTestModel1());
std::string enc_checksum;
- scoped_ptr<Value> value(EncodeHelper(model_to_encode.get(), &enc_checksum));
+ scoped_ptr<base::Value> value(
+ EncodeHelper(model_to_encode.get(), &enc_checksum));
EXPECT_TRUE(value.get() != NULL);
@@ -223,12 +229,12 @@ TEST_F(BookmarkCodecTest, ChecksumEncodeIdenticalModelsTest) {
// as the data is the same.
scoped_ptr<BookmarkModel> model1(CreateTestModel1());
std::string enc_checksum1;
- scoped_ptr<Value> value1(EncodeHelper(model1.get(), &enc_checksum1));
+ scoped_ptr<base::Value> value1(EncodeHelper(model1.get(), &enc_checksum1));
EXPECT_TRUE(value1.get() != NULL);
scoped_ptr<BookmarkModel> model2(CreateTestModel1());
std::string enc_checksum2;
- scoped_ptr<Value> value2(EncodeHelper(model2.get(), &enc_checksum2));
+ scoped_ptr<base::Value> value2(EncodeHelper(model2.get(), &enc_checksum2));
EXPECT_TRUE(value2.get() != NULL);
ASSERT_EQ(enc_checksum1, enc_checksum2);
@@ -237,12 +243,13 @@ TEST_F(BookmarkCodecTest, ChecksumEncodeIdenticalModelsTest) {
TEST_F(BookmarkCodecTest, ChecksumManualEditTest) {
scoped_ptr<BookmarkModel> model_to_encode(CreateTestModel1());
std::string enc_checksum;
- scoped_ptr<Value> value(EncodeHelper(model_to_encode.get(), &enc_checksum));
+ scoped_ptr<base::Value> value(
+ EncodeHelper(model_to_encode.get(), &enc_checksum));
EXPECT_TRUE(value.get() != NULL);
// Change something in the encoded value before decoding it.
- DictionaryValue* child1_value;
+ base::DictionaryValue* child1_value;
GetBookmarksBarChildValue(value.get(), 0, &child1_value);
std::string title;
ASSERT_TRUE(child1_value->GetString(BookmarkCodec::kNameKey, &title));
@@ -267,12 +274,13 @@ TEST_F(BookmarkCodecTest, ChecksumManualEditIDsTest) {
ASSERT_GT(bb_child_count, 1);
std::string enc_checksum;
- scoped_ptr<Value> value(EncodeHelper(model_to_encode.get(), &enc_checksum));
+ scoped_ptr<base::Value> value(
+ EncodeHelper(model_to_encode.get(), &enc_checksum));
EXPECT_TRUE(value.get() != NULL);
// Change IDs for all children of bookmark bar to be 1.
- DictionaryValue* child_value;
+ base::DictionaryValue* child_value;
for (int i = 0; i < bb_child_count; ++i) {
GetBookmarksBarChildValue(value.get(), i, &child_value);
std::string id;
@@ -299,7 +307,7 @@ TEST_F(BookmarkCodecTest, ChecksumManualEditIDsTest) {
TEST_F(BookmarkCodecTest, PersistIDsTest) {
scoped_ptr<BookmarkModel> model_to_encode(CreateTestModel3());
BookmarkCodec encoder;
- scoped_ptr<Value> model_value(encoder.Encode(model_to_encode.get()));
+ scoped_ptr<base::Value> model_value(encoder.Encode(model_to_encode.get()));
BookmarkModel decoded_model(NULL);
BookmarkCodec decoder;
@@ -319,7 +327,7 @@ TEST_F(BookmarkCodecTest, PersistIDsTest) {
GURL(kUrl4Url));
BookmarkCodec encoder2;
- scoped_ptr<Value> model_value2(encoder2.Encode(&decoded_model));
+ scoped_ptr<base::Value> model_value2(encoder2.Encode(&decoded_model));
BookmarkModel decoded_model2(NULL);
BookmarkCodec decoder2;
@@ -335,7 +343,7 @@ TEST_F(BookmarkCodecTest, CanDecodeModelWithoutMobileBookmarks) {
ASSERT_TRUE(base::PathExists(test_file));
JSONFileValueSerializer serializer(test_file);
- scoped_ptr<Value> root(serializer.Deserialize(NULL, NULL));
+ scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL));
BookmarkModel decoded_model(NULL);
BookmarkCodec decoder;
@@ -376,7 +384,7 @@ TEST_F(BookmarkCodecTest, EncodeAndDecodeMetaInfo) {
model->SetNodeMetaInfo(model->bookmark_bar_node()->GetChild(0),
"node_info", "value2");
std::string checksum;
- scoped_ptr<Value> value(EncodeHelper(model.get(), &checksum));
+ scoped_ptr<base::Value> value(EncodeHelper(model.get(), &checksum));
ASSERT_TRUE(value.get() != NULL);
// Decode and check for meta info.
@@ -401,7 +409,7 @@ TEST_F(BookmarkCodecTest, EncodeAndDecodeSyncTransactionVersion) {
model->SetNodeSyncTransactionVersion(bbn->GetChild(1), 42);
std::string checksum;
- scoped_ptr<Value> value(EncodeHelper(model.get(), &checksum));
+ scoped_ptr<base::Value> value(EncodeHelper(model.get(), &checksum));
ASSERT_TRUE(value.get() != NULL);
// Decode and verify.
@@ -423,7 +431,7 @@ TEST_F(BookmarkCodecTest, CanDecodeMetaInfoAsString) {
ASSERT_TRUE(base::PathExists(test_file));
JSONFileValueSerializer serializer(test_file);
- scoped_ptr<Value> root(serializer.Deserialize(NULL, NULL));
+ scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL));
BookmarkModel model(NULL);
BookmarkCodec decoder;
« no previous file with comments | « chrome/browser/bookmarks/bookmark_codec.cc ('k') | chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698