bookmarks: Rename BookmarkModelTestWithProfile to BookmarkModelTestClient.

components/bookmarks/browser/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/bookmarks/browser/bookmark_model.h"
 
 #include <set>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 887 matching lines @@
       const BookmarkNode* new_bb_node =
           model->AddFolder(bb_node, i, child->GetTitle());
       PopulateBookmarkNode(child, model, new_bb_node);
     } else {
       model->AddURL(bb_node, i, child->GetTitle(),
           GURL("http://" + base::UTF16ToASCII(child->GetTitle())));
     }
   }
 }
 
-// Test class that creates a BookmarkModel with a real history backend.
-class BookmarkModelTestWithProfile : public testing::Test {
+class BookmarkModelTestClient : public testing::Test {

[tfarina, 2015/05/14 00:58:53]

Scott, any suggestion for a better name?

[sky, 2015/05/14 15:13:56]

I find your new name worse. The two functions in this class don't really need to
be member functions. They could be in an anonymous namespace. If you did that,
then there really isn't a need for this class and the tests can go from TEST_F
to TEST. You still need a name though. I would probably go with
BookmarkModelTest2.

[tfarina, 2015/05/14 23:41:18]

Ah, that way is much better! I moved the member functions into the unnamed
namespace.

  public:
-  BookmarkModelTestWithProfile() {}
+  BookmarkModelTestClient() {}
 
  protected:
   // Verifies the contents of the bookmark bar node match the contents of the
   // TestNode.
   void VerifyModelMatchesNode(TestNode* expected, const BookmarkNode* actual) {
     ASSERT_EQ(expected->child_count(), actual->child_count());
     for (int i = 0; i < expected->child_count(); ++i) {
       TestNode* expected_child = expected->GetChild(i);
       const BookmarkNode* actual_child = actual->GetChild(i);
       ASSERT_EQ(expected_child->GetTitle(), actual_child->GetTitle());
@@ skipping 14 matching lines @@
     ui::TreeNodeIterator<const BookmarkNode> it(model->root_node());
     base::hash_set<int64> ids;
     while (it.has_next())
       ASSERT_TRUE(ids.insert(it.Next()->id()).second);
   }
 
   TestBookmarkClient client_;
   scoped_ptr<BookmarkModel> model_;
 };
 
-// Creates a set of nodes in the bookmark bar model, then recreates the
-// bookmark bar model which triggers loading from the db and checks the loaded
-// structure to make sure it is what we first created.
-TEST_F(BookmarkModelTestWithProfile, CreateAndRestore) {
+// Creates a set of nodes in the bookmark model, and checks that the loaded
+// structure is what we first created.
+TEST_F(BookmarkModelTestClient, CreateAndRestore) {
   struct TestData {
-    // Structure of the children of the bookmark bar model node.
+    // Structure of the children of the bookmark model node.
     const std::string bbn_contents;
     // Structure of the children of the other node.
     const std::string other_contents;
     // Structure of the children of the synced node.
     const std::string mobile_contents;
   } data[] = {
     // See PopulateNodeFromString for a description of these strings.
     { "", "" },
     { "a", "b" },
     { "a [ b ]", "" },
@@ skipping 226 matching lines @@
   EXPECT_FALSE(node.DeleteMetaInfo("key3"));
   EXPECT_FALSE(node.GetMetaInfo("key1", &out_value));
   EXPECT_FALSE(node.GetMetaInfo("key2.subkey1", &out_value));
   EXPECT_FALSE(node.GetMetaInfo("key2.subkey2", &out_value));
   EXPECT_FALSE(node.GetMetaInfo("key2.subkey2.leaf", &out_value));
   EXPECT_FALSE(node.GetMetaInfoMap());
 }
 
 }  // namespace
 }  // namespace bookmarks