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

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

Issue 8759017: BookmarkModel cleanup. synced_node is now mobile_node and I'm nuking (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk fix sync_integration_tests and extension test Created 9 years, 1 month 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_extension_helpers.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 7447124b6bf7d439e843e6accf66110b989e5959..9598250227773e84524ad5e535e188e55b3d794e 100644
--- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
@@ -116,7 +116,7 @@ class BookmarkCodecTest : public testing::Test {
int64 max_id;
bool result = codec->Decode(AsMutable(model->bookmark_bar_node()),
AsMutable(model->other_node()),
- AsMutable(model->synced_node()),
+ AsMutable(model->mobile_node()),
&max_id, value);
model->set_next_node_id(max_id);
return result;
@@ -167,7 +167,7 @@ class BookmarkCodecTest : public testing::Test {
std::set<int64> assigned_ids;
CheckIDs(model->bookmark_bar_node(), &assigned_ids);
CheckIDs(model->other_node(), &assigned_ids);
- CheckIDs(model->synced_node(), &assigned_ids);
+ CheckIDs(model->mobile_node(), &assigned_ids);
}
};
@@ -295,7 +295,7 @@ TEST_F(BookmarkCodecTest, PersistIDsTest) {
true);
}
-TEST_F(BookmarkCodecTest, CanDecodeModelWithoutSyncedBookmarks) {
+TEST_F(BookmarkCodecTest, CanDecodeModelWithoutMobileBookmarks) {
FilePath test_data_directory;
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory));
FilePath test_file = test_data_directory.AppendASCII(
@@ -334,5 +334,5 @@ TEST_F(BookmarkCodecTest, CanDecodeModelWithoutSyncedBookmarks) {
EXPECT_EQ(BookmarkNode::URL, child->type());
EXPECT_EQ(ASCIIToUTF16("Get started with Google Chrome"), child->GetTitle());
- ASSERT_TRUE(decoded_model.synced_node() != NULL);
+ ASSERT_TRUE(decoded_model.mobile_node() != NULL);
}
« no previous file with comments | « chrome/browser/bookmarks/bookmark_codec.cc ('k') | chrome/browser/bookmarks/bookmark_extension_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698