Fix lifetime of EnhancedBookmarkModel & BookmarkImageService

components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/enhanced_bookmarks/enhanced_bookmark_model.h"
 
 #include "base/base64.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 33 matching lines @@
   virtual void SetUp() OVERRIDE {
     message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
     bookmark_client_.reset(new bookmarks::TestBookmarkClient());
     bookmark_model_.reset(bookmark_client_->CreateModel().release());
     model_.reset(new EnhancedBookmarkModel(bookmark_model_.get(), "v1.0"));
     model_->AddObserver(this);
   }
 
   virtual void TearDown() OVERRIDE {
     if (model_)
-      model_->ShutDown();
+      model_->Shutdown();
     model_.reset();
     bookmark_model_.reset();
     bookmark_client_.reset();
     message_loop_.reset();
   }
 
  protected:
   const BookmarkNode* AddBookmark() {
     return AddBookmark("Some title", bookmark_model_->other_node());
   }
@@ skipping 375 matching lines @@
   // Since the description didn't actually change, the version field should
   // not either.
   EXPECT_EQ("v1.0", GetVersion(node));
 
   model_->SetDescription(node, "bar");
   EXPECT_EQ("v1.0/alpha", GetVersion(node));
 }
 
 // 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(
       parent, 0, base::ASCIIToUTF16("Some title"), GURL(BOOKMARK_URL));
   const BookmarkNode* node2 = bookmark_model_->AddURL(
       parent, 0, base::ASCIIToUTF16("Some title"), GURL(BOOKMARK_URL));
   const BookmarkNode* node3 = bookmark_model_->AddURL(
       parent, 0, base::ASCIIToUTF16("Some title"), GURL(BOOKMARK_URL));
   const BookmarkNode* node4 = bookmark_model_->AddURL(
       parent, 0, base::ASCIIToUTF16("Some title"), GURL(BOOKMARK_URL));
@@ skipping 95 matching lines @@
   EXPECT_EQ("v1.0/2", GetVersion(node));
 
   // Not actually changing any values should not set the version field.
   model_->SetVersionSuffix("3");
   model_->SetMultipleMetaInfo(node, meta_info);
   EXPECT_EQ("v1.0/2", GetVersion(node));
 }
 
 TEST_F(EnhancedBookmarkModelTest, ObserverShuttingDownEvent) {
   EXPECT_EQ(0, shutting_down_calls_);
-  model_->ShutDown();
+  model_->Shutdown();
   EXPECT_EQ(1, shutting_down_calls_);
   model_.reset();
 }
 
 TEST_F(EnhancedBookmarkModelTest, ObserverNodeAddedEvent) {
   EXPECT_EQ(0, added_calls_);
   const BookmarkNode* node = AddBookmark();
   EXPECT_EQ(1, added_calls_);
   EXPECT_EQ(node, last_added_);
 
@@ skipping 61 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(6, remote_id_changed_calls_);
   EXPECT_EQ("", last_remote_id_);
 }
 
 TEST_F(EnhancedBookmarkModelTest, ShutDownWhileResetDuplicationScheduled) {
   const BookmarkNode* node1 = AddBookmark();
   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();
 }