Fix shortcut name slicing for v2 apps on windows

chrome/browser/web_applications/web_app_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/browser/web_applications/web_app.h"
 
 #include <shlobj.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 129 matching lines @@
   return false;
 }
 
 std::vector<base::FilePath> MatchingShortcutsForProfileAndExtension(
     const base::FilePath& shortcut_path,
     const base::FilePath& profile_path,
     const string16& shortcut_name) {
   std::vector<base::FilePath> shortcut_paths;
   base::FilePath base_path = shortcut_path.
       Append(web_app::internals::GetSanitizedFileName(shortcut_name)).
-      ReplaceExtension(FILE_PATH_LITERAL(".lnk"));
+      AddExtension(FILE_PATH_LITERAL(".lnk"));
 
   const int fileNamesToCheck = 10;
   for (int i = 0; i < fileNamesToCheck; ++i) {
     base::FilePath shortcut_file = base_path;
     if (i) {
       shortcut_file = shortcut_file.InsertBeforeExtensionASCII(
           base::StringPrintf(" (%d)", i));
     }
     if (file_util::PathExists(shortcut_file) &&
         ShortcutIsForProfile(shortcut_file, profile_path)) {
@@ skipping 66 matching lines @@
   if (!file_util::PathExists(web_app_path) &&
       !file_util::CreateDirectory(web_app_path)) {
     return false;
   }
 
   // Generates file name to use with persisted ico and shortcut file.
   base::FilePath file_name =
       web_app::internals::GetSanitizedFileName(shortcut_info.title);
 
   // Creates an ico file to use with shortcut.
-  base::FilePath icon_file = web_app_path.Append(file_name).ReplaceExtension(
+  base::FilePath icon_file = web_app_path.Append(file_name).AddExtension(
       FILE_PATH_LITERAL(".ico"));
   if (!web_app::internals::CheckAndSaveIcon(icon_file,
         *shortcut_info.favicon.ToSkBitmap())) {
     return false;
   }
 
   base::FilePath target_exe = GetShortcutExecutablePath(shortcut_info);
   DCHECK(!target_exe.empty());
 
   // Working directory.
@@ skipping 15 matching lines @@
     description.resize(MAX_PATH - 1);
 
   // Generates app id from web app url and profile path.
   std::string app_name(web_app::GenerateApplicationNameFromInfo(shortcut_info));
   string16 app_id(ShellIntegration::GetAppModelIdForProfile(
       UTF8ToUTF16(app_name), shortcut_info.profile_path));
 
   bool success = true;
   for (size_t i = 0; i < shortcut_paths.size(); ++i) {
     base::FilePath shortcut_file = shortcut_paths[i].Append(file_name).
-        ReplaceExtension(FILE_PATH_LITERAL(".lnk"));
+        AddExtension(FILE_PATH_LITERAL(".lnk"));
     if (shortcut_paths[i] != web_app_path) {
       int unique_number =
           file_util::GetUniquePathNumber(shortcut_file, FILE_PATH_LITERAL(""));
       if (unique_number == -1) {
         success = false;
         continue;
       } else if (unique_number > 0) {
         shortcut_file = shortcut_file.InsertBeforeExtensionASCII(
             base::StringPrintf(" (%d)", unique_number));
       }
     }
     base::win::ShortcutProperties shortcut_properties;
     shortcut_properties.set_target(target_exe);
     shortcut_properties.set_working_dir(working_dir);
     shortcut_properties.set_arguments(wide_switches);
     shortcut_properties.set_description(description);
     shortcut_properties.set_icon(icon_file, 0);
     shortcut_properties.set_app_id(app_id);
     shortcut_properties.set_dual_mode(false);
     success = base::win::CreateOrUpdateShortcutLink(
         shortcut_file, shortcut_properties,
         base::win::SHORTCUT_CREATE_ALWAYS) && success;
   }
 
   if (success && pin_to_taskbar) {
     // Use the web app path shortcut for pinning to avoid having unique numbers
     // in the application name.
     base::FilePath shortcut_to_pin = web_app_path.Append(file_name).
-        ReplaceExtension(FILE_PATH_LITERAL(".lnk"));
+        AddExtension(FILE_PATH_LITERAL(".lnk"));
     success = base::win::TaskbarPinShortcutLink(
         shortcut_to_pin.value().c_str()) && success;
   }
 
   return success;
 }
 
 void UpdatePlatformShortcuts(
     const base::FilePath& web_app_path,
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   // Generates file name to use with persisted ico and shortcut file.
   base::FilePath file_name =
       web_app::internals::GetSanitizedFileName(shortcut_info.title);
 
   // If an icon file exists, and is out of date, replace it with the new icon
   // and let the shell know the icon has been modified.
-  base::FilePath icon_file = web_app_path.Append(file_name).ReplaceExtension(
+  base::FilePath icon_file = web_app_path.Append(file_name).AddExtension(
       FILE_PATH_LITERAL(".ico"));
   if (file_util::PathExists(icon_file)) {
     web_app::internals::CheckAndSaveIcon(icon_file,
         *shortcut_info.favicon.ToSkBitmap());
   }
 }
 
 void DeletePlatformShortcuts(
     const base::FilePath& web_app_path,
     const ShellIntegration::ShortcutInfo& shortcut_info) {
@@ skipping 20 matching lines @@
       // they are all unpinned.
       base::win::TaskbarUnpinShortcutLink(j->value().c_str());
       file_util::Delete(*j, false);
     }
   }
 }
 
 }  // namespace internals
 
 }  // namespace web_app