bookmarks: Cleanup, remove BookmarkModelTestUtils class.

chrome/browser/bookmarks/bookmark_model_unittest.cc

Index: chrome/browser/bookmarks/bookmark_model_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 2de0b3813ff33528188003618698503d5a5e1a31..96bb58bce577dd8faa09ec8cc91dbd088d3ba745 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -21,7 +21,6 @@
 #include "base/time/time.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
-#include "chrome/browser/bookmarks/bookmark_model_test_utils.h"
 #include "chrome/browser/bookmarks/bookmark_test_helpers.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/test/base/testing_profile.h"
@@ -595,32 +594,31 @@ TEST_F(BookmarkModelTest, NonMovingMoveCall) {
 TEST_F(BookmarkModelTest, Copy) {
   const BookmarkNode* root = model_.bookmark_bar_node();
   static const std::string model_string("a 1:[ b c ] d 2:[ e f g ] h ");
-  BookmarkModelTestUtils::AddNodesFromModelString(&model_, root, model_string);
+  test::AddNodesFromModelString(&model_, root, model_string);
 
   // Validate initial model.
-  std::string actual_model_string =
-      BookmarkModelTestUtils::ModelStringFromNode(root);
+  std::string actual_model_string = test::ModelStringFromNode(root);
   EXPECT_EQ(model_string, actual_model_string);
 
   // Copy 'd' to be after '1:b': URL item from bar to folder.
   const BookmarkNode* node_to_copy = root->GetChild(2);
   const BookmarkNode* destination = root->GetChild(1);
   model_.Copy(node_to_copy, destination, 1);
-  actual_model_string = BookmarkModelTestUtils::ModelStringFromNode(root);
+  actual_model_string = test::ModelStringFromNode(root);
   EXPECT_EQ("a 1:[ b d c ] d 2:[ e f g ] h ", actual_model_string);
 
   // Copy '1:d' to be after 'a': URL item from folder to bar.
   const BookmarkNode* folder = root->GetChild(1);
   node_to_copy = folder->GetChild(1);
   model_.Copy(node_to_copy, root, 1);
-  actual_model_string = BookmarkModelTestUtils::ModelStringFromNode(root);
+  actual_model_string = test::ModelStringFromNode(root);
   EXPECT_EQ("a d 1:[ b d c ] d 2:[ e f g ] h ", actual_model_string);
 
   // Copy '1' to be after '2:e': Folder from bar to folder.
   node_to_copy = root->GetChild(2);
   destination = root->GetChild(4);
   model_.Copy(node_to_copy, destination, 1);
-  actual_model_string = BookmarkModelTestUtils::ModelStringFromNode(root);
+  actual_model_string = test::ModelStringFromNode(root);
   EXPECT_EQ("a d 1:[ b d c ] d 2:[ e 1:[ b d c ] f g ] h ",
             actual_model_string);
 
@@ -628,21 +626,21 @@ TEST_F(BookmarkModelTest, Copy) {
   folder = root->GetChild(4);
   node_to_copy = folder->GetChild(1);
   model_.Copy(node_to_copy, folder, 3);
-  actual_model_string = BookmarkModelTestUtils::ModelStringFromNode(root);
+  actual_model_string = test::ModelStringFromNode(root);
   EXPECT_EQ("a d 1:[ b d c ] d 2:[ e 1:[ b d c ] f 1:[ b d c ] g ] h ",
             actual_model_string);
 
   // Copy first 'd' to be after 'h': URL item within the bar.
   node_to_copy = root->GetChild(1);
   model_.Copy(node_to_copy, root, 6);
-  actual_model_string = BookmarkModelTestUtils::ModelStringFromNode(root);
+  actual_model_string = test::ModelStringFromNode(root);
   EXPECT_EQ("a d 1:[ b d c ] d 2:[ e 1:[ b d c ] f 1:[ b d c ] g ] h d ",
             actual_model_string);
 
   // Copy '2' to be after 'a': Folder within the bar.
   node_to_copy = root->GetChild(4);
   model_.Copy(node_to_copy, root, 1);
-  actual_model_string = BookmarkModelTestUtils::ModelStringFromNode(root);
+  actual_model_string = test::ModelStringFromNode(root);
   EXPECT_EQ("a 2:[ e 1:[ b d c ] f 1:[ b d c ] g ] d 1:[ b d c ] "
             "d 2:[ e 1:[ b d c ] f 1:[ b d c ] g ] h d ",
             actual_model_string);