summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 04:54:09 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 04:54:09 +0000
commit0b0a7d7b536d44cb51a892009368f8ec14c9ab95 (patch)
tree2f2eb903e33f9033ac340a2e58075db054dea5b6 /chrome
parentada18ef6563816ea3ebcae904187a3bdcc17da0f (diff)
downloadchromium_src-0b0a7d7b536d44cb51a892009368f8ec14c9ab95.zip
chromium_src-0b0a7d7b536d44cb51a892009368f8ec14c9ab95.tar.gz
chromium_src-0b0a7d7b536d44cb51a892009368f8ec14c9ab95.tar.bz2
Remove wstrings from bookmarks, part 13.
This eliminates wstrings from bookmark_model_unittest.cc, which entails removing them from model_test_utils.*. BUG=23581 TEST=builds and passes tests Review URL: http://codereview.chromium.org/3141033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/bookmarks/bookmark_model_test_utils.cc4
-rw-r--r--chrome/browser/bookmarks/bookmark_model_unittest.cc52
-rw-r--r--chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.mm2
-rw-r--r--chrome/browser/cocoa/bookmark_bar_controller_unittest.mm48
-rw-r--r--chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm98
-rw-r--r--chrome/test/model_test_utils.cc46
-rw-r--r--chrome/test/model_test_utils.h7
7 files changed, 130 insertions, 127 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model_test_utils.cc b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
index e563a3f..263e42f 100644
--- a/chrome/browser/bookmarks/bookmark_model_test_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// 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.
@@ -15,7 +15,7 @@ void BookmarkModelTestUtils::AssertNodesEqual(const BookmarkNode* expected,
ASSERT_TRUE(actual);
if (check_ids)
EXPECT_EQ(expected->id(), actual->id());
- EXPECT_EQ(expected->GetTitle(), actual->GetTitle());
+ EXPECT_EQ(expected->GetTitleAsString16(), actual->GetTitleAsString16());
EXPECT_EQ(expected->type(), actual->type());
EXPECT_TRUE(expected->date_added() == actual->date_added());
if (expected->type() == BookmarkNode::URL) {
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 21e8bb2..5c788e2 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -315,11 +315,11 @@ TEST_F(BookmarkModelTest, Move) {
TEST_F(BookmarkModelTest, Copy) {
const BookmarkNode* root = model.GetBookmarkBarNode();
- static const std::wstring model_string(L"a 1:[ b c ] d 2:[ e f g ] h ");
+ static const std::string model_string("a 1:[ b c ] d 2:[ e f g ] h ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Copy 'd' to be after '1:b': URL item from bar to folder.
@@ -327,43 +327,43 @@ TEST_F(BookmarkModelTest, Copy) {
const BookmarkNode* destination = root->GetChild(1);
model.Copy(nodeToCopy, destination, 1);
actualModelString = model_test_utils::ModelStringFromNode(root);
- EXPECT_EQ(L"a 1:[ b d c ] d 2:[ e f g ] h ", actualModelString);
+ EXPECT_EQ("a 1:[ b d c ] d 2:[ e f g ] h ", actualModelString);
// Copy '1:d' to be after 'a': URL item from folder to bar.
const BookmarkNode* group = root->GetChild(1);
nodeToCopy = group->GetChild(1);
model.Copy(nodeToCopy, root, 1);
actualModelString = model_test_utils::ModelStringFromNode(root);
- EXPECT_EQ(L"a d 1:[ b d c ] d 2:[ e f g ] h ", actualModelString);
+ EXPECT_EQ("a d 1:[ b d c ] d 2:[ e f g ] h ", actualModelString);
// Copy '1' to be after '2:e': Folder from bar to folder.
nodeToCopy = root->GetChild(2);
destination = root->GetChild(4);
model.Copy(nodeToCopy, destination, 1);
actualModelString = model_test_utils::ModelStringFromNode(root);
- EXPECT_EQ(L"a d 1:[ b d c ] d 2:[ e 1:[ b d c ] f g ] h ", actualModelString);
+ EXPECT_EQ("a d 1:[ b d c ] d 2:[ e 1:[ b d c ] f g ] h ", actualModelString);
// Copy '2:1' to be after '2:f': Folder within same folder.
group = root->GetChild(4);
nodeToCopy = group->GetChild(1);
model.Copy(nodeToCopy, group, 3);
actualModelString = model_test_utils::ModelStringFromNode(root);
- EXPECT_EQ(L"a d 1:[ b d c ] d 2:[ e 1:[ b d c ] f 1:[ b d c ] g ] h ",
+ EXPECT_EQ("a d 1:[ b d c ] d 2:[ e 1:[ b d c ] f 1:[ b d c ] g ] h ",
actualModelString);
// Copy first 'd' to be after 'h': URL item within the bar.
nodeToCopy = root->GetChild(1);
model.Copy(nodeToCopy, root, 6);
actualModelString = model_test_utils::ModelStringFromNode(root);
- EXPECT_EQ(L"a d 1:[ b d c ] d 2:[ e 1:[ b d c ] f 1:[ b d c ] g ] h d ",
+ EXPECT_EQ("a d 1:[ b d c ] d 2:[ e 1:[ b d c ] f 1:[ b d c ] g ] h d ",
actualModelString);
// Copy '2' to be after 'a': Folder within the bar.
nodeToCopy = root->GetChild(4);
model.Copy(nodeToCopy, root, 1);
actualModelString = model_test_utils::ModelStringFromNode(root);
- EXPECT_EQ(L"a 2:[ e 1:[ b d c ] f 1:[ b d c ] g ] d 1:[ b d c ] "
- L"d 2:[ e 1:[ b d c ] f 1:[ b d c ] g ] h d ",
+ 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 ",
actualModelString);
}
@@ -560,24 +560,24 @@ typedef TreeNodeWithValue<BookmarkNode::Type> TestNode;
// Does the work of PopulateNodeFromString. index gives the index of the current
// element in description to process.
-static void PopulateNodeImpl(const std::vector<std::wstring>& description,
+static void PopulateNodeImpl(const std::vector<std::string>& description,
size_t* index,
TestNode* parent) {
while (*index < description.size()) {
- const std::wstring& element = description[*index];
+ const std::string& element = description[*index];
(*index)++;
- if (element == L"[") {
+ if (element == "[") {
// Create a new group and recurse to add all the children.
// Groups are given a unique named by way of an ever increasing integer
// value. The groups need not have a name, but one is assigned to help
// in debugging.
static int next_group_id = 1;
TestNode* new_node =
- new TestNode(UTF8ToWide(base::IntToString(next_group_id++)),
+ new TestNode(UTF16ToWideHack(base::IntToString16(next_group_id++)),
BookmarkNode::FOLDER);
parent->Add(parent->GetChildCount(), new_node);
PopulateNodeImpl(description, index, new_node);
- } else if (element == L"]") {
+ } else if (element == "]") {
// End the current group.
return;
} else {
@@ -588,7 +588,7 @@ static void PopulateNodeImpl(const std::vector<std::wstring>& description,
DCHECK(element.find('[') == std::string::npos);
DCHECK(element.find(']') == std::string::npos);
parent->Add(parent->GetChildCount(),
- new TestNode(element, BookmarkNode::URL));
+ new TestNode(UTF8ToWide(element), BookmarkNode::URL));
}
}
}
@@ -610,9 +610,9 @@ static void PopulateNodeImpl(const std::vector<std::wstring>& description,
//
// NOTE: each name must be unique, and groups are assigned a unique title by way
// of an increasing integer.
-static void PopulateNodeFromString(const std::wstring& description,
+static void PopulateNodeFromString(const std::string& description,
TestNode* parent) {
- std::vector<std::wstring> elements;
+ std::vector<std::string> elements;
size_t index = 0;
SplitStringAlongWhitespace(description, &elements);
PopulateNodeImpl(elements, &index, parent);
@@ -746,17 +746,17 @@ class BookmarkModelTestWithProfile : public testing::Test,
TEST_F(BookmarkModelTestWithProfile, CreateAndRestore) {
struct TestData {
// Structure of the children of the bookmark bar model node.
- const std::wstring bbn_contents;
+ const std::string bbn_contents;
// Structure of the children of the other node.
- const std::wstring other_contents;
+ const std::string other_contents;
} data[] = {
// See PopulateNodeFromString for a description of these strings.
- { L"", L"" },
- { L"a", L"b" },
- { L"a [ b ]", L"" },
- { L"", L"[ b ] a [ c [ d e [ f ] ] ]" },
- { L"a [ b ]", L"" },
- { L"a b c [ d e [ f ] ]", L"g h i [ j k [ l ] ]"},
+ { "", "" },
+ { "a", "b" },
+ { "a [ b ]", "" },
+ { "", "[ b ] a [ c [ d e [ f ] ] ]" },
+ { "a [ b ]", "" },
+ { "a b c [ d e [ f ] ]", "g h i [ j k [ l ] ]"},
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
// Recreate the profile. We need to reset with NULL first so that the last
@@ -959,7 +959,7 @@ TEST_F(BookmarkModelTest, Sort) {
// Populate the bookmark bar node with nodes for 'B', 'a', 'd' and 'C'.
// 'C' and 'a' are folders.
TestNode bbn;
- PopulateNodeFromString(L"B [ a ] d [ a ]", &bbn);
+ PopulateNodeFromString("B [ a ] d [ a ]", &bbn);
const BookmarkNode* parent = model.GetBookmarkBarNode();
PopulateBookmarkNode(&bbn, &model, parent);
diff --git a/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.mm b/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.mm
index 3323dc7..bea8970 100644
--- a/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.mm
+++ b/chrome/browser/cocoa/applescript/bookmark_applescript_utils_unittest.mm
@@ -51,7 +51,7 @@ BookmarkAppleScriptTest::BookmarkAppleScriptTest() {
[appDelegate_.get() setHelper:&helper_];
[NSApp setDelegate:appDelegate_];
const BookmarkNode* root = model().GetBookmarkBarNode();
- const std::wstring modelString(L"a f1:[ b d c ] d f2:[ e f g ] h ");
+ const std::string modelString("a f1:[ b d c ] d f2:[ e f g ] h ");
model_test_utils::AddNodesFromModelString(model(), root, modelString);
bookmarkBar_.reset([[BookmarkFolderAppleScript alloc]
initWithBookmarkNode:model().GetBookmarkBarNode()]);
diff --git a/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm
index b04455e..13a110c 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm
@@ -1315,11 +1315,11 @@ TEST_F(BookmarkBarControllerTest, TestFolders) {
TEST_F(BookmarkBarControllerTest, TestFolderButtons) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2b ] 3b 4f:[ 4f1b 4f2b ] ");
+ const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b 4f:[ 4f1b 4f2b ] ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model and that we do not have a folder controller.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
EXPECT_FALSE([bar_ folderController]);
@@ -1602,11 +1602,11 @@ TEST_F(BookmarkBarControllerTest, CloseFolderOnAnimate) {
TEST_F(BookmarkBarControllerTest, MoveRemoveAddButtons) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2b ] 3b ");
+ const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Remember how many buttons are showing.
@@ -1854,7 +1854,7 @@ class BookmarkBarControllerDragDropTest : public BookmarkBarControllerTestBase {
TEST_F(BookmarkBarControllerDragDropTest, DragMoveBarBookmarkToOffTheSide) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1bWithLongName 2fWithLongName:[ "
+ const std::string model_string("1bWithLongName 2fWithLongName:[ "
"2f1bWithLongName 2f2fWithLongName:[ 2f2f1bWithLongName "
"2f2f2bWithLongName 2f2f3bWithLongName 2f4b ] 2f3bWithLongName ] "
"3bWithLongName 4bWithLongName 5bWithLongName 6bWithLongName "
@@ -1863,7 +1863,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragMoveBarBookmarkToOffTheSide) {
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Insure that the off-the-side is not showing.
@@ -1906,16 +1906,16 @@ TEST_F(BookmarkBarControllerDragDropTest, DragMoveBarBookmarkToOffTheSide) {
TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
"2f3b ] 3b 4b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
const BookmarkNode* other = model.other_node();
- const std::wstring other_string(L"O1b O2b O3f:[ O3f1b O3f2f ] "
- "O4f:[ O4f1b O4f2f ] 05b ");
+ const std::string other_string("O1b O2b O3f:[ O3f1b O3f2f ] "
+ "O4f:[ O4f1b O4f2f ] 05b ");
model_test_utils::AddNodesFromModelString(model, other, other_string);
// Validate initial model.
- std::wstring actual = model_test_utils::ModelStringFromNode(root);
+ std::string actual = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actual);
actual = model_test_utils::ModelStringFromNode(other);
EXPECT_EQ(other_string, actual);
@@ -1937,8 +1937,8 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {
int newChildCount = root->GetChildCount();
EXPECT_EQ(oldChildCount + 1, newChildCount);
// Verify the model.
- const std::wstring expected(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
- "2f3b ] O3f:[ O3f1b O3f2f ] 3b 4b ");
+ const std::string expected("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
+ "2f3b ] O3f:[ O3f1b O3f2f ] 3b 4b ");
actual = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(expected, actual);
oldChildCount = newChildCount;
@@ -1956,9 +1956,9 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {
newChildCount = root->GetChildCount();
EXPECT_EQ(oldChildCount, newChildCount);
// Verify the model.
- const std::wstring expected1(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
- "2f3b O4f:[ O4f1b O4f2f ] ] O3f:[ O3f1b O3f2f ] "
- "3b 4b ");
+ const std::string expected1("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
+ "2f3b O4f:[ O4f1b O4f2f ] ] O3f:[ O3f1b O3f2f ] "
+ "3b 4b ");
actual = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(expected1, actual);
}
@@ -1966,12 +1966,12 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {
TEST_F(BookmarkBarControllerDragDropTest, AddURLs) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
- "2f3b ] 3b 4b ");
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
+ "2f3b ] 3b 4b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actual = model_test_utils::ModelStringFromNode(root);
+ std::string actual = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actual);
// Remember the children.
@@ -1989,8 +1989,8 @@ TEST_F(BookmarkBarControllerDragDropTest, AddURLs) {
int newChildCount = root->GetChildCount();
EXPECT_EQ(oldChildCount + 2, newChildCount);
// Verify the model.
- const std::wstring expected(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
- "2f3b ] SiteA SiteB 3b 4b ");
+ const std::string expected("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
+ "2f3b ] SiteA SiteB 3b 4b ");
actual = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(expected, actual);
}
@@ -1998,11 +1998,11 @@ TEST_F(BookmarkBarControllerDragDropTest, AddURLs) {
TEST_F(BookmarkBarControllerDragDropTest, ControllerForNode) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2b ] 3b ");
+ const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Find the main bar controller.
@@ -2014,11 +2014,11 @@ TEST_F(BookmarkBarControllerDragDropTest, ControllerForNode) {
TEST_F(BookmarkBarControllerDragDropTest, DropPositionIndicator) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2b 2f3b ] 3b 4b ");
+ const std::string model_string("1b 2f:[ 2f1b 2f2b 2f3b ] 3b 4b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModel = model_test_utils::ModelStringFromNode(root);
+ std::string actualModel = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModel);
// Test a series of points starting at the right edge of the bar.
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
index a636259..b84cc58 100644
--- a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
@@ -648,13 +648,13 @@ class BookmarkBarFolderControllerMenuTest : public CocoaTest {
TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToFolder) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Pop up a folder menu and drag in a button from the bar.
@@ -680,7 +680,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToFolder) {
to:[targetButton center]
copy:NO];
// The button should have landed just after "2f1b".
- const std::wstring expected_string(L"2f:[ 2f1b 1b 2f2f:[ 2f2f1b "
+ const std::string expected_string("2f:[ 2f1b 1b 2f2f:[ 2f2f1b "
"2f2f2b 2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ "
"4f2f1b 4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
EXPECT_EQ(expected_string, model_test_utils::ModelStringFromNode(root));
@@ -720,13 +720,13 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToFolder) {
TEST_F(BookmarkBarFolderControllerMenuTest, DragCopyBarBookmarkToFolder) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Pop up a folder menu and copy in a button from the bar.
@@ -751,7 +751,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragCopyBarBookmarkToFolder) {
to:[targetButton center]
copy:YES];
// The button should have landed just after "2f1b".
- const std::wstring expected_1(L"1b 2f:[ 2f1b 1b 2f2f:[ 2f2f1b "
+ const std::string expected_1("1b 2f:[ 2f1b 1b 2f2f:[ 2f2f1b "
"2f2f2b 2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ "
"4f2f1b 4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
EXPECT_EQ(expected_1, model_test_utils::ModelStringFromNode(root));
@@ -777,7 +777,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragCopyBarBookmarkToFolder) {
[bar_ dragButton:draggedButton
to:[targetButton left]
copy:YES];
- const std::wstring expected_2(L"1b 2f:[ 2f1b 1b 2f2f:[ 2f2f1b "
+ const std::string expected_2("1b 2f:[ 2f1b 1b 2f2f:[ 2f2f1b "
"2f2f2b 2f2f3b ] 2f3b ] 3b 1b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ "
"4f2f1b 4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
EXPECT_EQ(expected_2, model_test_utils::ModelStringFromNode(root));
@@ -786,13 +786,13 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragCopyBarBookmarkToFolder) {
TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToSubfolder) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Pop up a folder menu and a subfolder menu.
@@ -827,7 +827,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToSubfolder) {
to:[targetButton center]
copy:NO];
// The button should have landed just after "2f".
- const std::wstring expected_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b "
+ const std::string expected_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b "
"2f2f2b 2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ "
"4f2f1b 4f2f2b 4f2f3b 5b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] ");
EXPECT_EQ(expected_string, model_test_utils::ModelStringFromNode(root));
@@ -848,13 +848,13 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToSubfolder) {
TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveWithinFolder) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Pop up a folder menu.
@@ -878,7 +878,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveWithinFolder) {
to:[targetButton top]
copy:NO];
// The button should have landed above "4f1f".
- const std::wstring expected_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b "
+ const std::string expected_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b "
"2f2f2b 2f2f3b ] 2f3b ] 3b 4f:[ 4f2f:[ 4f2f1b 4f2f2b 4f2f3b ] "
"4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
EXPECT_EQ(expected_string, model_test_utils::ModelStringFromNode(root));
@@ -894,13 +894,13 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveWithinFolder) {
TEST_F(BookmarkBarFolderControllerMenuTest, DragParentOntoChild) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Pop up a folder menu.
@@ -928,13 +928,13 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragParentOntoChild) {
TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveChildToParent) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Pop up a folder menu and a subfolder menu.
@@ -964,7 +964,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveChildToParent) {
to:[targetButton top]
copy:NO];
// The button should have landed above "4f2f".
- const std::wstring expected_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
+ const std::string expected_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f3b 4f2f:[ "
"4f2f1b 4f2f2b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
EXPECT_EQ(expected_string, model_test_utils::ModelStringFromNode(root));
@@ -978,12 +978,12 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveChildToParent) {
TEST_F(BookmarkBarFolderControllerMenuTest, DragWindowResizing) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring
- model_string(L"a b:[ b1 b2 b3 ] reallyReallyLongBookmarkName c ");
+ const std::string
+ model_string("a b:[ b1 b2 b3 ] reallyReallyLongBookmarkName c ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Pop up a folder menu.
@@ -1007,8 +1007,8 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragWindowResizing) {
to:[targetButton center]
copy:NO];
// Verify the model change.
- const std::wstring
- expected_string(L"a b:[ b1 reallyReallyLongBookmarkName b2 b3 ] c ");
+ const std::string
+ expected_string("a b:[ b1 reallyReallyLongBookmarkName b2 b3 ] c ");
EXPECT_EQ(expected_string, model_test_utils::ModelStringFromNode(root));
// Verify the window grew. Just test a reasonable width gain.
CGFloat newWidth = NSWidth([toWindow frame]);
@@ -1018,11 +1018,11 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragWindowResizing) {
TEST_F(BookmarkBarFolderControllerMenuTest, MoveRemoveAddButtons) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2b 2f3b ] 3b 4b ");
+ const std::string model_string("1b 2f:[ 2f1b 2f2b 2f3b ] 3b 4b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Pop up a folder menu.
@@ -1078,11 +1078,11 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MoveRemoveAddButtons) {
TEST_F(BookmarkBarFolderControllerMenuTest, ControllerForNode) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2b ] 3b ");
+ const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Find the main bar controller.
@@ -1113,11 +1113,11 @@ TEST_F(BookmarkBarFolderControllerMenuTest, ControllerForNode) {
TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2b 3b ");
+ const std::string model_string("1b 2b 3b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
const BookmarkNode* parent = model.GetBookmarkBarNode();
@@ -1268,16 +1268,16 @@ TEST_F(BookmarkBarFolderControllerMenuTest, HoverThenDeleteBookmark) {
TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkData) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
- "2f3b ] 3b 4b ");
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
+ "2f3b ] 3b 4b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
const BookmarkNode* other = model.other_node();
- const std::wstring other_string(L"O1b O2b O3f:[ O3f1b O3f2f ] "
- "O4f:[ O4f1b O4f2f ] 05b ");
+ const std::string other_string("O1b O2b O3f:[ O3f1b O3f2f ] "
+ "O4f:[ O4f1b O4f2f ] 05b ");
model_test_utils::AddNodesFromModelString(model, other, other_string);
// Validate initial model.
- std::wstring actual = model_test_utils::ModelStringFromNode(root);
+ std::string actual = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actual);
actual = model_test_utils::ModelStringFromNode(other);
EXPECT_EQ(other_string, actual);
@@ -1302,8 +1302,8 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkData) {
[folderController dragBookmarkData:(id<NSDraggingInfo>)dragInfo.get()];
// Verify the model.
- const std::wstring expected(L"1b 2f:[ O3f:[ O3f1b O3f2f ] 2f1b 2f2f:[ 2f2f1b "
- "2f2f2b 2f2f3b ] 2f3b ] 3b 4b ");
+ const std::string expected("1b 2f:[ O3f:[ O3f1b O3f2f ] 2f1b 2f2f:[ 2f2f1b "
+ "2f2f2b 2f2f3b ] 2f3b ] 3b 4b ");
actual = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(expected, actual);
@@ -1317,8 +1317,8 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkData) {
[folderController dragBookmarkData:(id<NSDraggingInfo>)dragInfo.get()];
// Verify the model.
- const std::wstring expectedA(L"1b 2f:[ O3f:[ O3f1b O3f2f ] 2f1b 2f2f:[ "
- "2f2f1b 2f2f2b 2f2f3b O4f:[ O4f1b O4f2f ] ] "
+ const std::string expectedA("1b 2f:[ O3f:[ O3f1b O3f2f ] 2f1b 2f2f:[ "
+ "2f2f1b 2f2f2b 2f2f3b O4f:[ O4f1b O4f2f ] ] "
"2f3b ] 3b 4b ");
actual = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(expectedA, actual);
@@ -1327,12 +1327,12 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkData) {
TEST_F(BookmarkBarFolderControllerMenuTest, AddURLs) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
- "2f3b ] 3b 4b ");
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
+ "2f3b ] 3b 4b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actual = model_test_utils::ModelStringFromNode(root);
+ std::string actual = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actual);
// Pop open a folder.
@@ -1360,8 +1360,8 @@ TEST_F(BookmarkBarFolderControllerMenuTest, AddURLs) {
int newDisplayedButtons = [buttons count];
EXPECT_EQ(oldDisplayedButtons + 2, newDisplayedButtons);
// Verify the model.
- const std::wstring expected(L"1b 2f:[ SiteA SiteB 2f1b 2f2f:[ 2f2f1b 2f2f2b "
- "2f2f3b ] 2f3b ] 3b 4b ");
+ const std::string expected("1b 2f:[ SiteA SiteB 2f1b 2f2f:[ 2f2f1b 2f2f2b "
+ "2f2f3b ] 2f3b ] 3b 4b ");
actual = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(expected, actual);
}
@@ -1369,12 +1369,12 @@ TEST_F(BookmarkBarFolderControllerMenuTest, AddURLs) {
TEST_F(BookmarkBarFolderControllerMenuTest, DropPositionIndicator) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
- "2f3b ] 3b 4b ");
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
+ "2f3b ] 3b 4b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actual = model_test_utils::ModelStringFromNode(root);
+ std::string actual = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actual);
// Pop open the folder.
@@ -1425,12 +1425,12 @@ class BookmarkBarFolderControllerClosingTest : public
TEST_F(BookmarkBarFolderControllerClosingTest, DeleteClosesFolder) {
BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
const BookmarkNode* root = model.GetBookmarkBarNode();
- const std::wstring model_string(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b ] "
- "2f3b ] 3b ");
+ const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b ] "
+ "2f3b ] 3b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
// Validate initial model.
- std::wstring actualModelString = model_test_utils::ModelStringFromNode(root);
+ std::string actualModelString = model_test_utils::ModelStringFromNode(root);
EXPECT_EQ(model_string, actualModelString);
// Open the folder menu and submenu.
diff --git a/chrome/test/model_test_utils.cc b/chrome/test/model_test_utils.cc
index 8522622..d430c7e 100644
--- a/chrome/test/model_test_utils.cc
+++ b/chrome/test/model_test_utils.cc
@@ -10,18 +10,18 @@
namespace model_test_utils {
-std::wstring ModelStringFromNode(const BookmarkNode* node) {
+std::string ModelStringFromNode(const BookmarkNode* node) {
// Since the children of the node are not available as a vector,
// we'll just have to do it the hard way.
int child_count = node->GetChildCount();
- std::wstring child_string;
+ std::string child_string;
for (int i = 0; i < child_count; ++i) {
const BookmarkNode* child = node->GetChild(i);
if (child->is_folder()) {
- child_string += child->GetTitle() + L":[ " + ModelStringFromNode(child)
- + L"] ";
+ child_string += UTF16ToUTF8(child->GetTitleAsString16()) + ":[ " +
+ ModelStringFromNode(child) + "] ";
} else {
- child_string += child->GetTitle() + L" ";
+ child_string += UTF16ToUTF8(child->GetTitleAsString16()) + " ";
}
}
return child_string;
@@ -29,34 +29,34 @@ std::wstring ModelStringFromNode(const BookmarkNode* node) {
// Helper function which does the actual work of creating the nodes for
// a particular level in the hierarchy.
-std::wstring::size_type AddNodesFromString(BookmarkModel& model,
- const BookmarkNode* node,
- const std::wstring& model_string,
- std::wstring::size_type start_pos) {
+std::string::size_type AddNodesFromString(BookmarkModel& model,
+ const BookmarkNode* node,
+ const std::string& model_string,
+ std::string::size_type start_pos) {
DCHECK(node);
int index = node->GetChildCount();
- static const std::wstring folder_tell(L":[");
- std::wstring::size_type end_pos = model_string.find(' ', start_pos);
- while (end_pos != std::wstring::npos) {
- std::wstring::size_type part_length = end_pos - start_pos;
- std::wstring node_name = model_string.substr(start_pos, part_length);
+ static const std::string folder_tell(":[");
+ std::string::size_type end_pos = model_string.find(' ', start_pos);
+ while (end_pos != std::string::npos) {
+ std::string::size_type part_length = end_pos - start_pos;
+ std::string node_name = model_string.substr(start_pos, part_length);
// Are we at the end of a folder group?
- if (node_name != L"]") {
+ if (node_name != "]") {
// No, is it a folder?
- std::wstring tell;
+ std::string tell;
if (part_length > 2)
tell = node_name.substr(part_length - 2, 2);
if (tell == folder_tell) {
node_name = node_name.substr(0, part_length - 2);
const BookmarkNode* new_node =
- model.AddGroup(node, index, WideToUTF16Hack(node_name));
+ model.AddGroup(node, index, UTF8ToUTF16(node_name));
end_pos = AddNodesFromString(model, new_node, model_string,
end_pos + 1);
} else {
std::string url_string("http://");
url_string += std::string(node_name.begin(), node_name.end());
url_string += ".com";
- model.AddURL(node, index, WideToUTF16Hack(node_name), GURL(url_string));
+ model.AddURL(node, index, UTF8ToUTF16(node_name), GURL(url_string));
++end_pos;
}
++index;
@@ -72,13 +72,13 @@ std::wstring::size_type AddNodesFromString(BookmarkModel& model,
void AddNodesFromModelString(BookmarkModel& model,
const BookmarkNode* node,
- const std::wstring& model_string) {
+ const std::string& model_string) {
DCHECK(node);
- const std::wstring folder_tell(L":[");
- std::wstring::size_type start_pos = 0;
- std::wstring::size_type end_pos =
+ const std::string folder_tell(":[");
+ std::string::size_type start_pos = 0;
+ std::string::size_type end_pos =
AddNodesFromString(model, node, model_string, start_pos);
- DCHECK(end_pos == std::wstring::npos);
+ DCHECK(end_pos == std::string::npos);
}
} // namespace model_test_utils
diff --git a/chrome/test/model_test_utils.h b/chrome/test/model_test_utils.h
index 25e6a67..2db8127 100644
--- a/chrome/test/model_test_utils.h
+++ b/chrome/test/model_test_utils.h
@@ -23,7 +23,10 @@ namespace model_test_utils {
// 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
@@ -34,7 +37,7 @@ std::wstring ModelStringFromNode(const BookmarkNode* node);
// 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
generated by cgit v1.1 at 2025-03-02 08:11:36 +0000