Remove wstrings from bookmarks, part 3.

Get rid of wstring BookmarkModel::AddGroup() (and convert lots of uses; also
convert many uses of the wstring AddURL() as drive-by's).

BUG=23581
TEST=builds and passes tests

Review URL: http://codereview.chromium.org/3115017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56689 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 7 deletions

diff --git a/chrome/browser/extensions/extension_bookmarks_unittest.cc b/chrome/browser/extensions/extension_bookmarks_unittest.cc
index e0dd270..2381c91 100644
--- a/chrome/browser/extensions/extension_bookmarks_unittest.cc
+++ b/chrome/browser/extensions/extension_bookmarks_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/extensions/extension_bookmark_helpers.h"
@@ -14,16 +15,16 @@ class ExtensionBookmarksTest : public testing::Test {
  public:
   virtual void SetUp() {
     model_.reset(new BookmarkModel(NULL));
-    model_->AddURL(model_->other_node(), 0, L"Digg",
+    model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("Digg"),
                      GURL("http://www.reddit.com"));
-    model_->AddURL(model_->other_node(), 0, L"News",
+    model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("News"),
                      GURL("http://www.foxnews.com"));
     folder =
-        model_->AddGroup(model_->other_node(), 0, L"outer folder");
-    model_->AddGroup(folder, 0, L"inner folder 1");
-    model_->AddGroup(folder, 0, L"inner folder 2");
-    model_->AddURL(folder, 0, L"Digg", GURL("http://reddit.com"));
-    model_->AddURL(folder, 0, L"CNet", GURL("http://cnet.com"));
+        model_->AddGroup(model_->other_node(), 0, ASCIIToUTF16("outer folder"));
+    model_->AddGroup(folder, 0, ASCIIToUTF16("inner folder 1"));
+    model_->AddGroup(folder, 0, ASCIIToUTF16("inner folder 2"));
+    model_->AddURL(folder, 0, ASCIIToUTF16("Digg"), GURL("http://reddit.com"));
+    model_->AddURL(folder, 0, ASCIIToUTF16("CNet"), GURL("http://cnet.com"));
   }
 
   scoped_ptr<BookmarkModel> model_;