Cleanup: Don't bother doing no-op wide/utf16 conversions on Windows.

chrome/utility/importer/ie_importer_win.cc

 // Copyright (c) 2012 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/utility/importer/ie_importer_win.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <shlobj.h>
 #include <urlhist.h>
@@ skipping 274 matching lines @@
 
   std::swap(url_locator, *shortcut);
   return true;
 }
 
 // Reads the URL stored in the internet shortcut.
 GURL ReadURLFromInternetShortcut(IUniformResourceLocator* url_locator) {
   base::win::ScopedCoMem<wchar_t> url;
   // GetURL can return S_FALSE (FAILED(S_FALSE) is false) when url == NULL.
   return (FAILED(url_locator->GetURL(&url)) || !url) ?
-      GURL() : GURL(base::WideToUTF16(url.get()));
+      GURL() : GURL(url.get());
 }
 
 // Reads the URL of the favicon of the internet shortcut.
 GURL ReadFaviconURLFromInternetShortcut(IUniformResourceLocator* url_locator) {
   base::win::ScopedComPtr<IPropertySetStorage> property_set_storage;
   if (FAILED(property_set_storage.QueryFrom(url_locator)))
     return GURL();
 
   base::win::ScopedComPtr<IPropertyStorage> property_storage;
   if (FAILED(property_set_storage->Open(FMTID_Intshcut, STGM_READ,
                                         property_storage.Receive()))) {
     return GURL();
   }
 
   PROPSPEC properties[] = {{PRSPEC_PROPID, PID_IS_ICONFILE}};
   // ReadMultiple takes a non-const array of PROPVARIANTs, but since this code
   // only needs an array of size 1: a non-const pointer to |output| is
   // equivalent.
   base::win::ScopedPropVariant output;
   // ReadMultiple can return S_FALSE (FAILED(S_FALSE) is false) when the
   // property is not found, in which case output[0].vt is set to VT_EMPTY.
   if (FAILED(property_storage->ReadMultiple(1, properties, output.Receive())) ||
       output.get().vt != VT_LPWSTR)
     return GURL();
-  return GURL(base::WideToUTF16(output.get().pwszVal));
+  return GURL(output.get().pwszVal);
 }
 
 // Reads the favicon imaga data in an NTFS alternate data stream. This is where
 // IE7 and above store the data.
 bool ReadFaviconDataFromInternetShortcut(const base::string16& file,
                                          std::string* data) {
   return base::ReadFileToString(
       base::FilePath(file + kFaviconStreamName), data);
 }
 
@@ skipping 552 matching lines @@
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }