Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / bookmarks / bookmark_editor_view_unittest.cc

diff --git a/src/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/src/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
index df116da..9ab145e 100644 (file)
--- a/src/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
+++ b/src/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
@@ -20,6 +20,7 @@
 #include "ui/views/controls/tree/tree_view.h"
 
 using base::ASCIIToUTF16;
+using base::UTF8ToUTF16;
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
@@ -185,7 +186,7 @@ TEST_F(BookmarkEditorViewTest, EditTitleKeepsPosition) {
   CreateEditor(profile_.get(), NULL,
                BookmarkEditor::EditDetails::EditNode(GetNode("a")),
                BookmarkEditorView::SHOW_TREE);
-  SetTitleText(L"new_a");
+  SetTitleText(ASCIIToUTF16("new_a"));
 
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
 
@@ -204,7 +205,7 @@ TEST_F(BookmarkEditorViewTest, EditURLKeepsPosition) {
                BookmarkEditor::EditDetails::EditNode(GetNode("a")),
                BookmarkEditorView::SHOW_TREE);
 
-  SetURLText(base::UTF8ToWide(GURL(base_path() + "new_a").spec()));
+  SetURLText(UTF8ToUTF16(GURL(base_path() + "new_a").spec()));
 
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
 
@@ -238,7 +239,7 @@ TEST_F(BookmarkEditorViewTest, ChangeParentAndURL) {
                BookmarkEditor::EditDetails::EditNode(GetNode("a")),
                BookmarkEditorView::SHOW_TREE);
 
-  SetURLText(base::UTF8ToWide(GURL(base_path() + "new_a").spec()));
+  SetURLText(UTF8ToUTF16(GURL(base_path() + "new_a").spec()));
 
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(1));
 
@@ -293,8 +294,8 @@ TEST_F(BookmarkEditorViewTest, NewURL) {
                    bb_node, 1, GURL(), base::string16()),
                BookmarkEditorView::SHOW_TREE);
 
-  SetURLText(base::UTF8ToWide(GURL(base_path() + "a").spec()));
-  SetTitleText(L"new_a");
+  SetURLText(UTF8ToUTF16(GURL(base_path() + "a").spec()));
+  SetTitleText(ASCIIToUTF16("new_a"));
 
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
 
@@ -313,8 +314,8 @@ TEST_F(BookmarkEditorViewTest, ChangeURLNoTree) {
                  model_->other_node()->GetChild(0)),
                BookmarkEditorView::NO_TREE);
 
-  SetURLText(base::UTF8ToWide(GURL(base_path() + "a").spec()));
-  SetTitleText(L"new_a");
+  SetURLText(UTF8ToUTF16(GURL(base_path() + "a").spec()));
+  SetTitleText(ASCIIToUTF16("new_a"));
 
   ApplyEdits(NULL);
 
@@ -335,7 +336,7 @@ TEST_F(BookmarkEditorViewTest, ChangeTitleNoTree) {
                  model_->other_node()->GetChild(0)),
                BookmarkEditorView::NO_TREE);
 
-  SetTitleText(L"new_a");
+  SetTitleText(ASCIIToUTF16("new_a"));
 
   ApplyEdits(NULL);
 
@@ -359,7 +360,7 @@ TEST_F(BookmarkEditorViewTest, NewFolder) {
 
   // The url field shouldn't be visible.
   EXPECT_FALSE(URLTFHasParent());
-  SetTitleText(L"new_F");
+  SetTitleText(ASCIIToUTF16("new_F"));
 
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
 
@@ -387,7 +388,7 @@ TEST_F(BookmarkEditorViewTest, MoveFolder) {
   CreateEditor(profile_.get(), model_->bookmark_bar_node(),
                details, BookmarkEditorView::SHOW_TREE);
 
-  SetTitleText(L"new_F");
+  SetTitleText(ASCIIToUTF16("new_F"));
 
   // Create the folder in the 'other' folder.
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(1));
@@ -419,8 +420,8 @@ TEST_F(BookmarkEditorViewTest, NewFolderTitleUpdatedOnCommit) {
                BookmarkEditorView::SHOW_TREE);
   ExpandAndSelect();
 
-  SetURLText(base::UTF8ToWide(GURL(base_path() + "a").spec()));
-  SetTitleText(L"new_a");
+  SetURLText(UTF8ToUTF16(GURL(base_path() + "a").spec()));
+  SetTitleText(ASCIIToUTF16("new_a"));
 
   NewFolder();
   ASSERT_TRUE(tree_view()->editor() != NULL);