Cleanup: Remove some unneeded string allocations.

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 96 matching lines @@
     head += id_cb;
   }
   return reinterpret_cast<LPCITEMIDLIST>(&blob[offset]);
 }
 
 // Compares the two bookmarks in the order of IE's Favorites menu.
 // Returns true if rhs should come later than lhs (lhs < rhs).
 struct IEOrderBookmarkComparator {
   bool operator()(const ImportedBookmarkEntry& lhs,
                   const ImportedBookmarkEntry& rhs) const {
-    static const uint32 kNotSorted = 0xfffffffb; // IE uses this magic value.
+    static const uint32 kNotSorted = 0xfffffffb;  // IE uses this magic value.
     base::FilePath lhs_prefix;
     base::FilePath rhs_prefix;
     for (size_t i = 0; i <= lhs.path.size() && i <= rhs.path.size(); ++i) {
       const base::FilePath::StringType lhs_i =
         (i < lhs.path.size() ? lhs.path[i] : lhs.title + L".url");
       const base::FilePath::StringType rhs_i =
         (i < rhs.path.size() ? rhs.path[i] : rhs.title + L".url");
       lhs_prefix = lhs_prefix.Append(lhs_i);
       rhs_prefix = rhs_prefix.Append(rhs_i);
       if (lhs_i == rhs_i)
@@ skipping 49 matching lines @@
   // Traverse over the items.
   size_t base_offset = kItemListStartOffset;
   for (uint32 i = 0; i < item_count && !importer->cancelled(); ++i) {
     static const int kSizeOffset = 0;
     static const int kSortIndexOffset = 4;
     static const int kItemIDListOffset = 8;
 
     // Read the size (number of bytes) of the current item.
     uint32 item_size = 0;
     if (!BinaryRead(&item_size, base_offset + kSizeOffset, blob) ||
-        base_offset + item_size <= base_offset || // checking overflow
+        base_offset + item_size <= base_offset ||  // checking overflow
         base_offset + item_size > blob.size())
       return false;
 
     // Read the sort index of the current item.
     uint32 item_sort_index = 0;
     if (!BinaryRead(&item_sort_index, base_offset + kSortIndexOffset, blob))
       return false;
 
     // Read the file name from the ITEMIDLIST structure.
     LPCITEMIDLIST idlist = BinaryReadItemIDList(
@@ skipping 87 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(std::wstring(url)));
+      GURL() : GURL(base::WideToUTF16(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,
@@ skipping 568 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;
 }