importer: Convert ResolveInternetShortcut() to string16.

chrome/browser/importer/ie_importer.cc

 // Copyright (c) 2011 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/ie_importer.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlobj.h>
@@ skipping 444 matching lines @@
   std::wstring default_homepage_url;
   LONG result = keyDefault.ReadValue(kIEDefaultHomepage, &default_homepage_url);
   if (result == ERROR_SUCCESS && !default_homepage_url.empty()) {
     if (homepage.spec() == GURL(default_homepage_url).spec())
       return;
   }
 
   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) {
   if (!source_path_.empty()) {
     // Source path exists during testing.
     info->path = source_path_;
     info->path = info->path.AppendASCII("Favorites");
     info->links_folder = L"Links";
     return true;
   }
@@ skipping 89 matching lines @@
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE,
         L"Software\\Microsoft\\Internet Explorer", KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }