Change ownership of BookmarkClient

components/bookmarks/browser/bookmark_utils_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_utils.h"
 
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 56 matching lines @@
   int grouped_changes_beginning_count_;
   int grouped_changes_ended_count_;
 
   // Clipboard requires a message loop.
   base::MessageLoopForUI loop_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkUtilsTest);
 };
 
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   const BookmarkNode* node1 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("foo bar"),
                                             GURL("http://www.google.com"));
   const BookmarkNode* node2 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("baz buz"),
                                             GURL("http://www.cnn.com"));
   const BookmarkNode* folder1 =
       model->AddFolder(model->other_node(), 0, ASCIIToUTF16("foo"));
@@ skipping 36 matching lines @@
 
   // Bookmark Bar and Other Bookmarks are not returned in search results.
   *query.word_phrase_query = ASCIIToUTF16("Bookmark");
   GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
   ASSERT_EQ(0U, nodes.size());
   nodes.clear();
 }
 
 // Check exact matching against a URL query.
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   const BookmarkNode* node1 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("Google"),
                                             GURL("https://www.google.com/"));
   model->AddURL(model->other_node(),
                 0,
                 ASCIIToUTF16("Google Calendar"),
                 GURL("https://www.google.com/calendar"));
 
   model->AddFolder(model->other_node(), 0, ASCIIToUTF16("Folder"));
@@ skipping 14 matching lines @@
 
   // Empty URL should not match folders.
   *query.url = ASCIIToUTF16("");
   GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
   ASSERT_EQ(0U, nodes.size());
   nodes.clear();
 }
 
 // Check exact matching against a title query.
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   const BookmarkNode* node1 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("Google"),
                                             GURL("https://www.google.com/"));
   model->AddURL(model->other_node(),
                 0,
                 ASCIIToUTF16("Google Calendar"),
                 GURL("https://www.google.com/calendar"));
 
   const BookmarkNode* folder1 =
@@ skipping 16 matching lines @@
   // Title should match folders.
   *query.title = ASCIIToUTF16("Folder");
   GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == folder1);
   nodes.clear();
 }
 
 // Check matching against a query with multiple predicates.
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   const BookmarkNode* node1 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("Google"),
                                             GURL("https://www.google.com/"));
   model->AddURL(model->other_node(),
                 0,
                 ASCIIToUTF16("Google Calendar"),
                 GURL("https://www.google.com/calendar"));
 
   model->AddFolder(model->other_node(), 0, ASCIIToUTF16("Folder"));
@@ skipping 30 matching lines @@
     GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
     ASSERT_EQ(0U, nodes.size());
     nodes.clear();
     fields[i]->reset(original_value.release());
   }
 }
 
 // Copy and paste is not yet supported on iOS. http://crbug.com/228147
 #if !defined(OS_IOS)
 TEST_F(BookmarkUtilsTest, PasteBookmarkFromURL) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   const base::string16 url_text = ASCIIToUTF16("http://www.google.com/");
   const BookmarkNode* new_folder = model->AddFolder(
       model->bookmark_bar_node(), 0, ASCIIToUTF16("New_Folder"));
 
   // Write blank text to clipboard.
   {
     ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
     clipboard_writer.WriteText(base::string16());
   }
   // Now we shouldn't be able to paste from the clipboard.
   EXPECT_FALSE(CanPasteFromClipboard(model.get(), new_folder));
 
   // Write some valid url to the clipboard.
   {
     ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
     clipboard_writer.WriteText(url_text);
   }
   // Now we should be able to paste from the clipboard.
   EXPECT_TRUE(CanPasteFromClipboard(model.get(), new_folder));
 
   PasteFromClipboard(model.get(), new_folder, 0);
   ASSERT_EQ(1, new_folder->child_count());
 
   // Url for added node should be same as url_text.
   EXPECT_EQ(url_text, ASCIIToUTF16(new_folder->GetChild(0)->url().spec()));
 }
 
 TEST_F(BookmarkUtilsTest, CopyPaste) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   const BookmarkNode* node = model->AddURL(model->other_node(),
                                            0,
                                            ASCIIToUTF16("foo bar"),
                                            GURL("http://www.google.com"));
 
   // Copy a node to the clipboard.
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(node);
   CopyToClipboard(model.get(), nodes, false);
 
   // And make sure we can paste a bookmark from the clipboard.
   EXPECT_TRUE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node()));
 
   // Write some text to the clipboard.
   {
     ui::ScopedClipboardWriter clipboard_writer(
         ui::CLIPBOARD_TYPE_COPY_PASTE);
     clipboard_writer.WriteText(ASCIIToUTF16("foo"));
   }
 
   // Now we shouldn't be able to paste from the clipboard.
   EXPECT_FALSE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node()));
 }
 
 // Test for updating title such that url and title pair are unique among the
 // children of parent.
 TEST_F(BookmarkUtilsTest, MakeTitleUnique) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   const base::string16 url_text = ASCIIToUTF16("http://www.google.com/");
   const base::string16 title_text = ASCIIToUTF16("foobar");
   const BookmarkNode* bookmark_bar_node = model->bookmark_bar_node();
 
   const BookmarkNode* node =
       model->AddURL(bookmark_bar_node, 0, title_text, GURL(url_text));
 
   EXPECT_EQ(url_text,
             ASCIIToUTF16(bookmark_bar_node->GetChild(0)->url().spec()));
   EXPECT_EQ(title_text, bookmark_bar_node->GetChild(0)->GetTitle());
@@ skipping 12 matching lines @@
   // Url for added node should be same as url_text.
   EXPECT_EQ(url_text,
             ASCIIToUTF16(bookmark_bar_node->GetChild(1)->url().spec()));
   // Title for added node should be numeric subscript suffix with copied node
   // title.
   EXPECT_EQ(ASCIIToUTF16("foobar (1)"),
             bookmark_bar_node->GetChild(1)->GetTitle());
 }
 
 TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   const BookmarkNode* node = model->AddURL(model->other_node(),
                                            0,
                                            ASCIIToUTF16("foo bar"),
                                            GURL("http://www.google.com"));
   model->SetNodeMetaInfo(node, "somekey", "somevalue");
   model->SetNodeMetaInfo(node, "someotherkey", "someothervalue");
 
   // Copy a node to the clipboard.
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(node);
@@ skipping 21 matching lines @@
   EXPECT_EQ("someothervalue", value);
 }
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 // http://crbug.com/396472
 #define MAYBE_CutToClipboard DISABLED_CutToClipboard
 #else
 #define MAYBE_CutToClipboard CutToClipboard
 #endif
 TEST_F(BookmarkUtilsTest, MAYBE_CutToClipboard) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   model->AddObserver(this);
 
   base::string16 title(ASCIIToUTF16("foo"));
   GURL url("http://foo.com");
   const BookmarkNode* n1 = model->AddURL(model->other_node(), 0, title, url);
   const BookmarkNode* n2 = model->AddURL(model->other_node(), 1, title, url);
 
   // Cut the nodes to the clipboard.
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(n1);
   nodes.push_back(n2);
   CopyToClipboard(model.get(), nodes, true);
 
   // Make sure the nodes were removed.
   EXPECT_EQ(0, model->other_node()->child_count());
 
   // Make sure observers were notified the set of changes should be grouped.
   ExpectGroupedChangeCount(1, 1);
 
   // And make sure we can paste from the clipboard.
   EXPECT_TRUE(CanPasteFromClipboard(model.get(), model->other_node()));
 }
 
 TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
-  TestBookmarkClient client;
   // Load a model with an extra node that is not editable.
   BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
   BookmarkPermanentNodeList extra_nodes;
   extra_nodes.push_back(extra_node);
-  client.SetExtraNodesToLoad(extra_nodes.Pass());
-
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(
+      TestBookmarkClient::CreateModel(extra_nodes.Pass(), nullptr, false));
   const BookmarkNode* node = model->AddURL(model->other_node(),
                                            0,
                                            ASCIIToUTF16("foo bar"),
                                            GURL("http://www.google.com"));
 
   // Copy a node to the clipboard.
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(node);
   CopyToClipboard(model.get(), nodes, false);
 
   // And make sure we can paste a bookmark from the clipboard.
   EXPECT_TRUE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node()));
 
   // But it can't be pasted into a non-editable folder.
   EXPECT_FALSE(model->CanBeEditedByUser(extra_node));
   EXPECT_FALSE(CanPasteFromClipboard(model.get(), extra_node));
 }
 #endif  // !defined(OS_IOS)
 
 TEST_F(BookmarkUtilsTest, GetParentForNewNodes) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   // This tests the case where selection contains one item and that item is a
   // folder.
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(model->bookmark_bar_node());
   int index = -1;
   const BookmarkNode* real_parent =
       GetParentForNewNodes(model->bookmark_bar_node(), nodes, &index);
   EXPECT_EQ(real_parent, model->bookmark_bar_node());
   EXPECT_EQ(0, index);
 
@@ skipping 20 matching lines @@
 
   // This tests the case where selection doesn't contain any items.
   nodes.clear();
   real_parent = GetParentForNewNodes(model->bookmark_bar_node(), nodes, &index);
   EXPECT_EQ(real_parent, model->bookmark_bar_node());
   EXPECT_EQ(2, index);
 }
 
 // Verifies that meta info is copied when nodes are cloned.
 TEST_F(BookmarkUtilsTest, CloneMetaInfo) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   // Add a node containing meta info.
   const BookmarkNode* node = model->AddURL(model->other_node(),
                                            0,
                                            ASCIIToUTF16("foo bar"),
                                            GURL("http://www.google.com"));
   model->SetNodeMetaInfo(node, "somekey", "somevalue");
   model->SetNodeMetaInfo(node, "someotherkey", "someothervalue");
 
   // Clone node to a different folder.
   const BookmarkNode* folder =
@@ skipping 12 matching lines @@
   std::string value;
   EXPECT_TRUE(clone->GetMetaInfo("somekey", &value));
   EXPECT_EQ("somevalue", value);
   EXPECT_TRUE(clone->GetMetaInfo("someotherkey", &value));
   EXPECT_EQ("someothervalue", value);
 }
 
 // Verifies that meta info fields in the non cloned set are not copied when
 // cloning a bookmark.
 TEST_F(BookmarkUtilsTest, CloneBookmarkResetsNonClonedKey) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   model->AddNonClonedKey("foo");
   const BookmarkNode* parent = model->other_node();
   const BookmarkNode* node = model->AddURL(
       parent, 0, ASCIIToUTF16("title"), GURL("http://www.google.com"));
   model->SetNodeMetaInfo(node, "foo", "ignored value");
   model->SetNodeMetaInfo(node, "bar", "kept value");
   std::vector<BookmarkNodeData::Element> elements;
   BookmarkNodeData::Element node_data(node);
   elements.push_back(node_data);
 
   // Cloning a bookmark should clear the non cloned key.
   CloneBookmarkNode(model.get(), elements, parent, 0, true);
   ASSERT_EQ(2, parent->child_count());
   std::string value;
   EXPECT_FALSE(parent->GetChild(0)->GetMetaInfo("foo", &value));
 
   // Other keys should still be cloned.
   EXPECT_TRUE(parent->GetChild(0)->GetMetaInfo("bar", &value));
   EXPECT_EQ("kept value", value);
 }
 
 // Verifies that meta info fields in the non cloned set are not copied when
 // cloning a folder.
 TEST_F(BookmarkUtilsTest, CloneFolderResetsNonClonedKey) {
-  TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   model->AddNonClonedKey("foo");
   const BookmarkNode* parent = model->other_node();
   const BookmarkNode* node = model->AddFolder(parent, 0, ASCIIToUTF16("title"));
   model->SetNodeMetaInfo(node, "foo", "ignored value");
   model->SetNodeMetaInfo(node, "bar", "kept value");
   std::vector<BookmarkNodeData::Element> elements;
   BookmarkNodeData::Element node_data(node);
   elements.push_back(node_data);
 
   // Cloning a folder should clear the non cloned key.
   CloneBookmarkNode(model.get(), elements, parent, 0, true);
   ASSERT_EQ(2, parent->child_count());
   std::string value;
   EXPECT_FALSE(parent->GetChild(0)->GetMetaInfo("foo", &value));
 
   // Other keys should still be cloned.
   EXPECT_TRUE(parent->GetChild(0)->GetMetaInfo("bar", &value));
   EXPECT_EQ("kept value", value);
 }
 
 TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) {
-  TestBookmarkClient client;
   // Load a model with an extra node that is not editable.
   BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
   BookmarkPermanentNodeList extra_nodes;
   extra_nodes.push_back(extra_node);
-  client.SetExtraNodesToLoad(extra_nodes.Pass());
 
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(
+      TestBookmarkClient::CreateModel(extra_nodes.Pass(), nullptr, false));
   EXPECT_TRUE(model->bookmark_bar_node()->empty());
   EXPECT_TRUE(model->other_node()->empty());
   EXPECT_TRUE(model->mobile_node()->empty());
   EXPECT_TRUE(extra_node->empty());
 
   const base::string16 title = base::ASCIIToUTF16("Title");
   const GURL url("http://google.com");
   model->AddURL(model->bookmark_bar_node(), 0, title, url);
   model->AddURL(model->other_node(), 0, title, url);
   model->AddURL(model->mobile_node(), 0, title, url);
   model->AddURL(extra_node, 0, title, url);
 
   std::vector<const BookmarkNode*> nodes;
   model->GetNodesByURL(url, &nodes);
   ASSERT_EQ(4u, nodes.size());
 
   RemoveAllBookmarks(model.get(), url);
 
   nodes.clear();
   model->GetNodesByURL(url, &nodes);
   ASSERT_EQ(1u, nodes.size());
   EXPECT_TRUE(model->bookmark_bar_node()->empty());
   EXPECT_TRUE(model->other_node()->empty());
   EXPECT_TRUE(model->mobile_node()->empty());
   EXPECT_EQ(1, extra_node->child_count());
 }
 
 }  // namespace
 }  // namespace bookmarks