Revert 168080 - Configure system-level Chrome settings (i.e. install its shortcuts) immediately fol…

chrome/installer/util/shell_util.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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 1779 matching lines @@
   bool delete_folder = (location == SHORTCUT_LOCATION_START_MENU);
 
   FilePath shortcut_folder;
   if (!GetShortcutPath(location, dist, level, &shortcut_folder) ||
       shortcut_folder.empty()) {
     NOTREACHED();
     return false;
   }
 
   string16 shortcut_base_name(
-      (shortcut_name ? *shortcut_name :
-                       dist->GetAppShortCutName()) + installer::kLnkExt);
+      (shortcut_name ? *shortcut_name : dist->GetAppShortCutName()) +
+      installer::kLnkExt);
   FilePath shortcut_path(shortcut_folder.Append(shortcut_base_name));
 
   if (!file_util::PathExists(shortcut_path))
     return true;
 
-  FilePath read_target;
-  if (!base::win::ResolveShortcut(shortcut_path, &read_target, NULL))
+  base::win::ScopedComPtr<IShellLink> i_shell_link;
+  base::win::ScopedComPtr<IPersistFile> i_persist_file;
+  wchar_t read_target[MAX_PATH] = {};
+  if (FAILED(i_shell_link.CreateInstance(CLSID_ShellLink, NULL,
+                                         CLSCTX_INPROC_SERVER)) ||
+      FAILED(i_persist_file.QueryFrom(i_shell_link)) ||
+      FAILED(i_persist_file->Load(shortcut_path.value().c_str(), STGM_READ)) ||
+      FAILED(i_shell_link->GetPath(read_target, MAX_PATH, NULL,
+                                   SLGP_SHORTPATH))) {
+    NOTREACHED();
     return false;
+  }
 
-  if (InstallUtil::ProgramCompare(
-          FilePath(target_exe)).Evaluate(read_target.value())) {
+  if (InstallUtil::ProgramCompare(FilePath(target_exe)).Evaluate(read_target)) {
     // Unpin the shortcut if it was ever pinned by the user or the installer.
     VLOG(1) << "Trying to unpin " << shortcut_path.value();
     if (!base::win::TaskbarUnpinShortcutLink(shortcut_path.value().c_str())) {
       VLOG(1) << shortcut_path.value()
               << " wasn't pinned (or the unpin failed).";
     }
     if (delete_folder)
       return file_util::Delete(shortcut_folder, true);
     else
       return file_util::Delete(shortcut_path, false);
@@ skipping 123 matching lines @@
     // are any left...).
     if (free_bits >= 8 && next_byte_index < size) {
       free_bits -= 8;
       bit_stream += bytes[next_byte_index++] << free_bits;
     }
   }
 
   DCHECK_EQ(ret.length(), encoded_length);
   return ret;
 }