Revert 71485 - Remove wstring from TemplateURL and friends....

chrome/browser/importer/firefox2_importer.cc

-// Copyright (c) 2011 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.
 
 #include "chrome/browser/importer/firefox2_importer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 121 matching lines @@
 TemplateURL* Firefox2Importer::CreateTemplateURL(const std::wstring& title,
                                                  const std::wstring& keyword,
                                                  const GURL& url) {
   // Skip if the keyword or url is invalid.
   if (keyword.empty() && url.is_valid())
     return NULL;
 
   TemplateURL* t_url = new TemplateURL();
   // We set short name by using the title if it exists.
   // Otherwise, we use the shortcut.
-  t_url->set_short_name(WideToUTF16Hack(!title.empty() ? title : keyword));
-  t_url->set_keyword(WideToUTF16Hack(keyword));
-  t_url->SetURL(TemplateURLRef::DisplayURLToURLRef(UTF8ToUTF16(url.spec())),
+  t_url->set_short_name(!title.empty() ? title : keyword);
+  t_url->set_keyword(keyword);
+  t_url->SetURL(TemplateURLRef::DisplayURLToURLRef(UTF8ToWide(url.spec())),
                 0, 0);
   return t_url;
 }
 
 // static
 void Firefox2Importer::ImportBookmarksFile(
     const FilePath& file_path,
     const std::set<GURL>& default_urls,
     bool import_to_bookmark_bar,
     const std::wstring& first_folder_name,
@@ skipping 426 matching lines @@
 
   // We need to make up a URL for the favicon. We use a version of the page's
   // URL so that we can be sure it will not collide.
   usage.favicon_url = GURL(std::string("made-up-favicon:") + link_url.spec());
 
   // We only have one URL per favicon for Firefox 2 bookmarks.
   usage.urls.insert(link_url);
 
   favicons->push_back(usage);
 }