importer: Convert ResolveInternetShortcut() to string16.

BUG=43460
R=mirandac@chromium.org

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

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

chrome/browser/importer/ie_importer.cc

@@ -462,30 +462,30 @@ void IEImporter::ImportHomepage() {
   bridge_->AddHomePage(homepage);
 }
 
-std::wstring IEImporter::ResolveInternetShortcut(const std::wstring& file) {
+string16 IEImporter::ResolveInternetShortcut(const string16& file) {
   base::win::ScopedCoMem<wchar_t> url;
   base::win::ScopedComPtr<IUniformResourceLocator> url_locator;
   HRESULT result = url_locator.CreateInstance(CLSID_InternetShortcut, NULL,
                                               CLSCTX_INPROC_SERVER);
   if (FAILED(result))
-    return std::wstring();
+    return string16();
 
   base::win::ScopedComPtr<IPersistFile> persist_file;
   result = persist_file.QueryFrom(url_locator);
   if (FAILED(result))
-    return std::wstring();
+    return string16();
 
   // Loads the Internet Shortcut from persistent storage.
   result = persist_file->Load(file.c_str(), STGM_READ);
   if (FAILED(result))
-    return std::wstring();
+    return string16();
 
   result = url_locator->GetURL(&url);
   // GetURL can return S_FALSE (FAILED(S_FALSE) is false) when url == NULL.
   if (FAILED(result) || (url == NULL))
-    return std::wstring();
+    return string16();
 
-  return std::wstring(url);
+  return string16(url);
 }
 
 bool IEImporter::GetFavoritesInfo(IEImporter::FavoritesInfo* info) {

chrome/browser/importer/ie_importer.h

@@ -6,13 +6,13 @@
 #define CHROME_BROWSER_IMPORTER_IE_IMPORTER_H_
 #pragma once
 
-#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/file_path.h"
+#include "base/string16.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/importer/profile_writer.h"
 
@@ -31,7 +31,7 @@ class IEImporter : public Importer {
   // A struct that hosts the information of IE Favorite folder.
   struct FavoritesInfo {
     FilePath path;
-    std::wstring links_folder;
+    string16 links_folder;
   };
 
   // IE PStore subkey GUID: AutoComplete password & form data.
@@ -65,7 +65,7 @@ class IEImporter : public Importer {
 
   // Resolves what's the .url file actually targets.
   // Returns empty string if failed.
-  std::wstring ResolveInternetShortcut(const std::wstring& file);
+  string16 ResolveInternetShortcut(const string16& file);
 
   // Gets the information of Favorites folder. Returns true if successful.
   bool GetFavoritesInfo(FavoritesInfo* info);