Remove wstrings in bookmarks, part 5.

chrome/test/live_sync/bookmark_model_verifier.cc

 // 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.
 
 #include "chrome/test/live_sync/bookmark_model_verifier.h"
 
 #include <vector>
 #include <stack>
 
 #include "app/tree_node_iterator.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/test/live_sync/live_bookmarks_sync_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using std::string;
 using std::wstring;
 
 // static
@@ skipping 153 matching lines @@
     }
   }
   return bm_folder;
 }
 
 const BookmarkNode* BookmarkModelVerifier::AddURL(BookmarkModel* model,
     const BookmarkNode* parent, int index, const wstring& title,
     const GURL& url) {
   const BookmarkNode* v_parent = NULL;
   FindNodeInVerifier(model, parent, &v_parent);
-  const BookmarkNode* result = model->AddURL(parent, index, title, url);
+  const BookmarkNode* result = model->AddURL(parent, index,
+                                             WideToUTF16Hack(title), url);
   EXPECT_TRUE(result);
   if (!result)
     return NULL;
-  const BookmarkNode* v_node = model_->AddURL(v_parent, index, title, url);
+  const BookmarkNode* v_node = model_->AddURL(v_parent, index,
+                                              WideToUTF16Hack(title), url);
   EXPECT_TRUE(v_node);
   if (!v_node)
     return NULL;
   ExpectBookmarkInfoMatch(v_node, result);
   return result;
 }
 
 void BookmarkModelVerifier::SetTitle(BookmarkModel* model,
                                      const BookmarkNode* node,
                                      const wstring& title) {
@@ skipping 46 matching lines @@
   const BookmarkNode* v_node = NULL;
   FindNodeInVerifier(model, node, &v_node);
   const BookmarkNode* result = bookmark_utils::ApplyEditsWithNoGroupChange(
       model, node->GetParent(), BookmarkEditor::EditDetails(node),
       node->GetTitleAsString16(), new_url);
   bookmark_utils::ApplyEditsWithNoGroupChange(model_, v_node->GetParent(),
       BookmarkEditor::EditDetails(v_node), v_node->GetTitleAsString16(),
       new_url);
   return result;
 }