Remove wstrings from bookmarks, part 13.

chrome/test/model_test_utils.h

 // Copyright (c) 2010 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_TEST_MODEL_TEST_UTILS_H_
 #define CHROME_TEST_MODEL_TEST_UTILS_H_
 #pragma once
 
 #include <string>
 
 class BookmarkModel;
 class BookmarkNode;
 
 namespace model_test_utils {
 
 // 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 "
-std::wstring ModelStringFromNode(const BookmarkNode* node);
+//
+// (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::wstring& model_string);
+                             const std::string& model_string);
 
 }  // namespace model_test_utils
 
 #endif  // CHROME_TEST_MODEL_TEST_UTILS_H_