Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1256)

Unified Diff: chrome/utility/importer/ie_importer_win.cc

Issue 879783004: Cleanup: Don't bother doing no-op wide/utf16 conversions on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/version_ui.cc ('k') | components/crash/app/crash_keys_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/importer/ie_importer_win.cc
diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importer/ie_importer_win.cc
index 95ab6e7c6954c97444f6d11e1f816ecc28f98358..8d6368d0b2f7ce35da4a70ee11468912b49b7e3a 100644
--- a/chrome/utility/importer/ie_importer_win.cc
+++ b/chrome/utility/importer/ie_importer_win.cc
@@ -292,7 +292,7 @@ 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.
@@ -317,7 +317,7 @@ GURL ReadFaviconURLFromInternetShortcut(IUniformResourceLocator* url_locator) {
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
« no previous file with comments | « chrome/browser/ui/webui/version_ui.cc ('k') | components/crash/app/crash_keys_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698