Remove wstrings in bookmarks, part 5.

chrome/test/model_test_utils.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 "model_test_utils.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "googleurl/src/gurl.h"
 
@@ skipping 38 matching lines @@
       if (tell == folder_tell) {
         node_name = node_name.substr(0, part_length - 2);
         const BookmarkNode* new_node =
             model.AddGroup(node, index, WideToUTF16Hack(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, node_name, GURL(url_string));
+        model.AddURL(node, index, WideToUTF16Hack(node_name), GURL(url_string));
         ++end_pos;
       }
       ++index;
       start_pos = end_pos;
       end_pos = model_string.find(' ', start_pos);
     } else {
       ++end_pos;
       break;
     }
   }
   return end_pos;
 }
 
 void AddNodesFromModelString(BookmarkModel& model,
                              const BookmarkNode* node,
                              const std::wstring& model_string) {
   DCHECK(node);
   const std::wstring folder_tell(L":[");
   std::wstring::size_type start_pos = 0;
   std::wstring::size_type end_pos =
       AddNodesFromString(model, node, model_string, start_pos);
   DCHECK(end_pos == std::wstring::npos);
 }
 
 }  // namespace model_test_utils