Revert "Enable positional parameters for base::vsnprintf and base::vswprintf on Windows."

chrome/installer/setup/install.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/installer/setup/install.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <time.h>
 
@@ skipping 267 matching lines @@
   elements_dir.push_back(base::FilePath::kSeparators[0]);
   elements_dir.append(installer::kVisualElements);
 
   // Some distributions of Chromium may not include visual elements. Only
   // proceed if this distribution does.
   if (!base::PathExists(src_path.Append(elements_dir))) {
     VLOG(1) << "No visual elements found, not writing "
             << installer::kVisualElementsManifest << " to " << src_path.value();
     return true;
   } else {
-    // A printf_p-style format string for generating the visual elements
+    // A printf-style format string for generating the visual elements
     // manifest. Required arguments, in order, are:
     //   - Localized display name for the product.
-    //   - Relative path to the VisualElements directory.
+    //   - Relative path to the VisualElements directory, three times.
     static const char kManifestTemplate[] =
         "<Application>\r\n"
         "  <VisualElements\r\n"
-        "      DisplayName='%1$ls'\r\n"
-        "      Logo='%2$ls\\Logo.png'\r\n"
-        "      SmallLogo='%2$ls\\SmallLogo.png'\r\n"
+        "      DisplayName='%ls'\r\n"
+        "      Logo='%ls\\Logo.png'\r\n"
+        "      SmallLogo='%ls\\SmallLogo.png'\r\n"
         "      ForegroundText='light'\r\n"
         "      BackgroundColor='#323232'>\r\n"
         "    <DefaultTile ShowName='allLogos'/>\r\n"
-        "    <SplashScreen Image='%2$ls\\splash-620x300.png'/>\r\n"
+        "    <SplashScreen Image='%ls\\splash-620x300.png'/>\r\n"
         "  </VisualElements>\r\n"
         "</Application>";
 
     const base::string16 manifest_template(
         base::ASCIIToUTF16(kManifestTemplate));
 
     BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution(
         BrowserDistribution::CHROME_BROWSER);
     // TODO(grt): http://crbug.com/75152 Write a reference to a localized
     // resource for |display_name|.
     base::string16 display_name(dist->GetDisplayName());
     EscapeXmlAttributeValueInSingleQuotes(&display_name);
 
     // Fill the manifest with the desired values.
     base::string16 manifest16(base::StringPrintf(
-        manifest_template.c_str(), display_name.c_str(), elements_dir.c_str()));
+        manifest_template.c_str(), display_name.c_str(), elements_dir.c_str(),
+        elements_dir.c_str(), elements_dir.c_str()));
 
     // Write the manifest to |src_path|.
     const std::string manifest(base::UTF16ToUTF8(manifest16));
     int size = base::checked_cast<int>(manifest.size());
     if (base::WriteFile(
         src_path.Append(installer::kVisualElementsManifest),
             manifest.c_str(), size) == size) {
       VLOG(1) << "Successfully wrote " << installer::kVisualElementsManifest
               << " to " << src_path.value();
       return true;
@@ skipping 311 matching lines @@
            INSTALL_SHORTCUT_CREATE_EACH_IF_NO_SYSTEM_LEVEL);
 
   // Read master_preferences copied beside chrome.exe at install.
   MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs));
   base::FilePath chrome_exe(installation_root.Append(kChromeExe));
   CreateOrUpdateShortcuts(
       chrome_exe, chrome, prefs, CURRENT_USER, install_operation);
 }
 
 }  // namespace installer