summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks/bookmark_codec_unittest.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 22:29:29 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 22:29:29 +0000
commit37bc9130662cb8e86f2a2999b2323f80ab623821 (patch)
tree3f80593d37c5f28d969c09186c305406874835d0 /chrome/browser/bookmarks/bookmark_codec_unittest.cc
parent4b9f729a0b70ef2d916e718e48e9552dcc3d3e7d (diff)
downloadchromium_src-37bc9130662cb8e86f2a2999b2323f80ab623821.zip
chromium_src-37bc9130662cb8e86f2a2999b2323f80ab623821.tar.gz
chromium_src-37bc9130662cb8e86f2a2999b2323f80ab623821.tar.bz2
BookmarkModel cleanup. synced_node is now mobile_node and I'm nuking
IsVisible as it's no longer needed. This cl resulted in a ton of changes, the majority are renames though. BUG=102714 TEST=covered by tests Review URL: http://codereview.chromium.org/8759017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks/bookmark_codec_unittest.cc')
-rw-r--r--chrome/browser/bookmarks/bookmark_codec_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
index 7447124..9598250 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);
}