diff options
| author | rfevang <rfevang@chromium.org> | 2014-12-05 17:27:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-06 01:27:50 +0000 |
| commit | d75d32217b42f56477569525fa6a4c64d5db4527 (patch) | |
| tree | dcb324891123fadc4617106d4ca67b9514fbf183 /components/enhanced_bookmarks | |
| parent | f3848eee6c17acc74543c803bcea7ea542e13cbc (diff) | |
| download | chromium_src-d75d32217b42f56477569525fa6a4c64d5db4527.zip chromium_src-d75d32217b42f56477569525fa6a4c64d5db4527.tar.gz chromium_src-d75d32217b42f56477569525fa6a4c64d5db4527.tar.bz2 | |
Reset remote ids of bookmark nodes when creating a clone.
BUG=419528
Review URL: https://codereview.chromium.org/620453004
Cr-Commit-Position: refs/heads/master@{#307136}
Diffstat (limited to 'components/enhanced_bookmarks')
| -rw-r--r-- | components/enhanced_bookmarks/enhanced_bookmark_model.cc | 1 | ||||
| -rw-r--r-- | components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model.cc b/components/enhanced_bookmarks/enhanced_bookmark_model.cc index e9b8bae..1046e64 100644 --- a/components/enhanced_bookmarks/enhanced_bookmark_model.cc +++ b/components/enhanced_bookmarks/enhanced_bookmark_model.cc @@ -91,6 +91,7 @@ EnhancedBookmarkModel::EnhancedBookmarkModel(BookmarkModel* bookmark_model, version_(version), weak_ptr_factory_(this) { bookmark_model_->AddObserver(this); + bookmark_model_->AddNonClonedKey(kIdKey); if (bookmark_model_->loaded()) { InitializeIdMap(); loaded_ = true; diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc index 90855bb..c6662da 100644 --- a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc +++ b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc @@ -764,3 +764,9 @@ TEST_F(EnhancedBookmarkModelTest, bookmark_model_->Remove(gp, gp->GetIndexOf(parent)); EXPECT_FALSE(model_->BookmarkForRemoteId(remote_id)); } + +TEST_F(EnhancedBookmarkModelTest, AddsRemoteIdToNonClonedKeys) { + const std::set<std::string>& non_cloned_keys = + bookmark_model_->non_cloned_keys(); + EXPECT_TRUE(non_cloned_keys.find("stars.id") != non_cloned_keys.end()); +} |