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

Side by Side Diff: components/bookmarks/browser/bookmark_codec_unittest.cc

Issue 2539363004: Make base::Value::TYPE a scoped enum. (Closed)
Patch Set: Rebase Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/bookmarks/browser/bookmark_codec.h" 5 #include "components/bookmarks/browser/bookmark_codec.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url)); 107 model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url));
108 const BookmarkNode* folder1 = 108 const BookmarkNode* folder1 =
109 model->AddFolder(bookmark_bar, 1, ASCIIToUTF16(kFolder1Title)); 109 model->AddFolder(bookmark_bar, 1, ASCIIToUTF16(kFolder1Title));
110 model->AddURL(folder1, 0, ASCIIToUTF16(kUrl2Title), GURL(kUrl2Url)); 110 model->AddURL(folder1, 0, ASCIIToUTF16(kUrl2Title), GURL(kUrl2Url));
111 return model.release(); 111 return model.release();
112 } 112 }
113 113
114 void GetBookmarksBarChildValue(base::Value* value, 114 void GetBookmarksBarChildValue(base::Value* value,
115 size_t index, 115 size_t index,
116 base::DictionaryValue** result_value) { 116 base::DictionaryValue** result_value) {
117 ASSERT_EQ(base::Value::TYPE_DICTIONARY, value->GetType()); 117 ASSERT_EQ(base::Value::Type::DICTIONARY, value->GetType());
118 118
119 base::DictionaryValue* d_value = nullptr; 119 base::DictionaryValue* d_value = nullptr;
120 value->GetAsDictionary(&d_value); 120 value->GetAsDictionary(&d_value);
121 base::Value* roots; 121 base::Value* roots;
122 ASSERT_TRUE(d_value->Get(BookmarkCodec::kRootsKey, &roots)); 122 ASSERT_TRUE(d_value->Get(BookmarkCodec::kRootsKey, &roots));
123 ASSERT_EQ(base::Value::TYPE_DICTIONARY, roots->GetType()); 123 ASSERT_EQ(base::Value::Type::DICTIONARY, roots->GetType());
124 124
125 base::DictionaryValue* roots_d_value = nullptr; 125 base::DictionaryValue* roots_d_value = nullptr;
126 roots->GetAsDictionary(&roots_d_value); 126 roots->GetAsDictionary(&roots_d_value);
127 base::Value* bb_value; 127 base::Value* bb_value;
128 ASSERT_TRUE( 128 ASSERT_TRUE(
129 roots_d_value->Get(BookmarkCodec::kRootFolderNameKey, &bb_value)); 129 roots_d_value->Get(BookmarkCodec::kRootFolderNameKey, &bb_value));
130 ASSERT_EQ(base::Value::TYPE_DICTIONARY, bb_value->GetType()); 130 ASSERT_EQ(base::Value::Type::DICTIONARY, bb_value->GetType());
131 131
132 base::DictionaryValue* bb_d_value = nullptr; 132 base::DictionaryValue* bb_d_value = nullptr;
133 bb_value->GetAsDictionary(&bb_d_value); 133 bb_value->GetAsDictionary(&bb_d_value);
134 base::Value* bb_children_value; 134 base::Value* bb_children_value;
135 ASSERT_TRUE( 135 ASSERT_TRUE(
136 bb_d_value->Get(BookmarkCodec::kChildrenKey, &bb_children_value)); 136 bb_d_value->Get(BookmarkCodec::kChildrenKey, &bb_children_value));
137 ASSERT_EQ(base::Value::TYPE_LIST, bb_children_value->GetType()); 137 ASSERT_EQ(base::Value::Type::LIST, bb_children_value->GetType());
138 138
139 base::ListValue* bb_children_l_value = nullptr; 139 base::ListValue* bb_children_l_value = nullptr;
140 bb_children_value->GetAsList(&bb_children_l_value); 140 bb_children_value->GetAsList(&bb_children_l_value);
141 base::Value* child_value; 141 base::Value* child_value;
142 ASSERT_TRUE(bb_children_l_value->Get(index, &child_value)); 142 ASSERT_TRUE(bb_children_l_value->Get(index, &child_value));
143 ASSERT_EQ(base::Value::TYPE_DICTIONARY, child_value->GetType()); 143 ASSERT_EQ(base::Value::Type::DICTIONARY, child_value->GetType());
144 144
145 child_value->GetAsDictionary(result_value); 145 child_value->GetAsDictionary(result_value);
146 } 146 }
147 147
148 base::Value* EncodeHelper(BookmarkModel* model, std::string* checksum) { 148 base::Value* EncodeHelper(BookmarkModel* model, std::string* checksum) {
149 BookmarkCodec encoder; 149 BookmarkCodec encoder;
150 // Computed and stored checksums should be empty. 150 // Computed and stored checksums should be empty.
151 EXPECT_EQ("", encoder.computed_checksum()); 151 EXPECT_EQ("", encoder.computed_checksum());
152 EXPECT_EQ("", encoder.stored_checksum()); 152 EXPECT_EQ("", encoder.stored_checksum());
153 153
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 bbn->GetChild(1)->GetMetaInfo(kSyncTransactionVersionKey, &meta_value)); 477 bbn->GetChild(1)->GetMetaInfo(kSyncTransactionVersionKey, &meta_value));
478 EXPECT_TRUE(bbn->GetChild(0)->GetMetaInfo(kNormalKey, &meta_value)); 478 EXPECT_TRUE(bbn->GetChild(0)->GetMetaInfo(kNormalKey, &meta_value));
479 EXPECT_EQ("value", meta_value); 479 EXPECT_EQ("value", meta_value);
480 EXPECT_TRUE(bbn->GetChild(1)->GetMetaInfo(kNormalKey, &meta_value)); 480 EXPECT_TRUE(bbn->GetChild(1)->GetMetaInfo(kNormalKey, &meta_value));
481 EXPECT_EQ("value2", meta_value); 481 EXPECT_EQ("value2", meta_value);
482 EXPECT_TRUE(bbn->GetChild(0)->GetMetaInfo(kNestedKey, &meta_value)); 482 EXPECT_TRUE(bbn->GetChild(0)->GetMetaInfo(kNestedKey, &meta_value));
483 EXPECT_EQ("value3", meta_value); 483 EXPECT_EQ("value3", meta_value);
484 } 484 }
485 485
486 } // namespace bookmarks 486 } // namespace bookmarks
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698