Remove packaged app Windows shortcuts when app is uninstalled.

base/file_util_unittest.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 1599 matching lines @@
                           CLSCTX_INPROC_SERVER, IID_IShellLink,
                           reinterpret_cast<LPVOID*>(&shell));
   EXPECT_TRUE(SUCCEEDED(result));
   result = shell->QueryInterface(IID_IPersistFile,
                              reinterpret_cast<LPVOID*>(&persist));
   EXPECT_TRUE(SUCCEEDED(result));
   result = shell->SetPath(target_file.value().c_str());
   EXPECT_TRUE(SUCCEEDED(result));
   result = shell->SetDescription(L"ResolveShortcutTest");
   EXPECT_TRUE(SUCCEEDED(result));
+  result = shell->SetArguments(L"--args");
+  EXPECT_TRUE(SUCCEEDED(result));
   result = persist->Save(link_file.value().c_str(), TRUE);
   EXPECT_TRUE(SUCCEEDED(result));
   if (persist)
     persist->Release();
   if (shell)
     shell->Release();
 
   bool is_solved;
-  is_solved = file_util::ResolveShortcut(&link_file);
+  std::wstring args;
+  is_solved = file_util::ResolveShortcut(link_file, &link_file, &args);
   EXPECT_TRUE(is_solved);
+  EXPECT_EQ(L"--args", args);
   std::wstring contents;
   contents = ReadTextFile(link_file);
   EXPECT_EQ(L"This is the target.", contents);
 
   // Cleaning
   DeleteFile(target_file.value().c_str());
   DeleteFile(link_file.value().c_str());
   CoUninitialize();
 }
 
 TEST_F(FileUtilTest, CreateShortcutTest) {
   const wchar_t* file_contents = L"This is another target.";
   FilePath target_file = temp_dir_.path().Append(L"Target1.txt");
   CreateTextFile(target_file, file_contents);
 
   FilePath link_file = temp_dir_.path().Append(L"Link1.lnk");
 
   CoInitialize(NULL);
   EXPECT_TRUE(file_util::CreateOrUpdateShortcutLink(
                   target_file.value().c_str(), link_file.value().c_str(), NULL,
                   NULL, NULL, NULL, 0, NULL,
                   file_util::SHORTCUT_CREATE_ALWAYS));
-  FilePath resolved_name = link_file;
-  EXPECT_TRUE(file_util::ResolveShortcut(&resolved_name));
+  FilePath resolved_name;
+  EXPECT_TRUE(file_util::ResolveShortcut(link_file, &resolved_name, NULL));
   std::wstring read_contents = ReadTextFile(resolved_name);
   EXPECT_EQ(file_contents, read_contents);
 
   DeleteFile(target_file.value().c_str());
   DeleteFile(link_file.value().c_str());
   CoUninitialize();
 }
 
 TEST_F(FileUtilTest, CopyAndDeleteDirectoryTest) {
   // Create a directory
@@ skipping 795 matching lines @@
       file_util::VerifyPathControlledByUser(
           base_dir_, text_file_, uid_, ok_gids_));
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           sub_dir_, text_file_, uid_, ok_gids_));
 }
 
 #endif  // defined(OS_POSIX)
 
 }  // namespace