Move bookmarks' test support file to the bookmarks component

components/bookmarks/core/test/bookmark_test_helpers.h

 // Copyright 2013 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.
 
-#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_TEST_HELPERS_H_
-#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_TEST_HELPERS_H_
+#ifndef COMPONENTS_BOOKMARKS_CORE_TEST_BOOKMARK_TEST_HELPERS_H_

[blundell, 2014/05/06 09:24:45]

For components, we've typically put the test support code next to the production
code, i.e., in //components/bookmarks/core/browser in this case. I don't see a
reason to deviate from that here.

+#define COMPONENTS_BOOKMARKS_CORE_TEST_BOOKMARK_TEST_HELPERS_H_
 
 #include <string>
 
 class BookmarkModel;
 class BookmarkNode;
 
 namespace test {

[blundell, 2014/05/06 09:24:45]

These can just be in the bookmarks namespace once you move all the component
code to being in the bookmarks namespace.

 
 // Blocks until |model| finishes loading.
 void WaitForBookmarkModelToLoad(BookmarkModel* model);
 
 // 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 " " } "]"
@@ skipping 11 matching lines @@
 // 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_
+#endif  // COMPONENTS_BOOKMARKS_CORE_TEST_BOOKMARK_TEST_HELPERS_H_