bookmarks: Cleanup, remove BookmarkModelTestUtils class.

chrome/browser/bookmarks/bookmark_test_helpers.h

Index: chrome/browser/bookmarks/bookmark_test_helpers.h
diff --git a/chrome/browser/bookmarks/bookmark_test_helpers.h b/chrome/browser/bookmarks/bookmark_test_helpers.h
index ed3e3275be55b2b30b3af77a3275399ffa1ed1bc..82504bcd47fd17adae918320b48ac5838860062b 100644
--- a/chrome/browser/bookmarks/bookmark_test_helpers.h
+++ b/chrome/browser/bookmarks/bookmark_test_helpers.h
@@ -5,7 +5,10 @@
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_TEST_HELPERS_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_TEST_HELPERS_H_
 
+#include <string>
+
 class BookmarkModel;
+class BookmarkNode;
 class Profile;
 
 namespace test {
@@ -14,6 +17,31 @@ namespace test {
 void WaitForBookmarkModelToLoad(BookmarkModel* model);
 void WaitForBookmarkModelToLoad(Profile* profile);
 
+// Return the descendants of |node| as a string useful for verifying node
+// modifications. The format of the resulting string is:
+//
+//           result = node " " , { node " " }
+//             node = bookmark title | folder
+//           folder = folder title ":[ " { node " " } "]"
+//   bookmark title = (* string with no spaces *)
+//     folder title = (* string with no spaces *)
+//
+// Example: "a f1:[ b d c ] d f2:[ e f g ] h "
+//
+// (Logically, we should use |string16|s, but it's more convenient for test
+// purposes to use (UTF-8) |std::string|s.)
+std::string ModelStringFromNode(const BookmarkNode* node);
+
+// Create and add the node hierarchy specified by |nodeString| to the
+// bookmark node given by |node|. The string has the same format as
+// specified for ModelStringFromNode. The new nodes added to |node|
+// are appended to the end of node's existing subnodes, if any.
+// |model| must be the model of which |node| is a member.
+// NOTE: The string format is very rigid and easily broken if not followed
+//       exactly (since we're using a very simple parser).
+void AddNodesFromModelString(BookmarkModel* model,
+                             const BookmarkNode* node,
+                             const std::string& model_string);
 }  // namespace test
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_TEST_HELPERS_H_