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

Unified Diff: components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc

Issue 588233002: Fix lifetime of EnhancedBookmarkModel & BookmarkImageService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation of unittests Created 6 years, 3 months 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 | « components/enhanced_bookmarks/enhanced_bookmark_model.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
index e5b72109433307e31519dcf0854e70b40f8053d3..e7d6eff358ce274a08e233ced68a7bfc3f10c81e 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
+++ b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
@@ -51,7 +51,7 @@ class EnhancedBookmarkModelTest
virtual void TearDown() OVERRIDE {
if (model_)
- model_->ShutDown();
+ model_->Shutdown();
model_.reset();
bookmark_model_.reset();
bookmark_client_.reset();
@@ -447,7 +447,7 @@ TEST_F(EnhancedBookmarkModelTest, TestVersionField) {
// Verifies that duplicate nodes are reset when the model is created.
TEST_F(EnhancedBookmarkModelTest, ResetDuplicateNodesOnInitialization) {
- model_->ShutDown();
+ model_->Shutdown();
const BookmarkNode* parent = bookmark_model_->other_node();
const BookmarkNode* node1 = bookmark_model_->AddURL(
@@ -563,7 +563,7 @@ TEST_F(EnhancedBookmarkModelTest, SetMultipleMetaInfo) {
TEST_F(EnhancedBookmarkModelTest, ObserverShuttingDownEvent) {
EXPECT_EQ(0, shutting_down_calls_);
- model_->ShutDown();
+ model_->Shutdown();
EXPECT_EQ(1, shutting_down_calls_);
model_.reset();
}
@@ -645,7 +645,7 @@ TEST_F(EnhancedBookmarkModelTest, ShutDownWhileResetDuplicationScheduled) {
const BookmarkNode* node2 = AddBookmark();
bookmark_model_->SetNodeMetaInfo(node1, "stars.id", "c_1");
bookmark_model_->SetNodeMetaInfo(node2, "stars.id", "c_1");
- model_->ShutDown();
+ model_->Shutdown();
model_.reset();
base::RunLoop().RunUntilIdle();
}
« no previous file with comments | « components/enhanced_bookmarks/enhanced_bookmark_model.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698