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

extensions/browser/api/printer_provider/printer_provider_apitest.cc

 // Copyright 2015 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 "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "extensions/browser/api/printer_provider/printer_provider_api.h"
 #include "extensions/common/extension.h"
@@ skipping 249 matching lines @@
                                      &printers, run_loop.QuitClosure()));
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   run_loop.Run();
 
   std::vector<std::string> expected_printers;
   expected_printers.push_back(base::StringPrintf(
       "{"
       "\"description\":\"Test printer\","
-      "\"extensionId\":\"%1$s\","
-      "\"id\":\"%1$s:printer1\","
+      "\"extensionId\":\"%s\","
+      "\"id\":\"%s:printer1\","
       "\"name\":\"Printer 1\""
       "}",
-      extension_id.c_str()));
+      extension_id.c_str(), extension_id.c_str()));
   expected_printers.push_back(base::StringPrintf(
       "{"
-      "\"extensionId\":\"%1$s\","
-      "\"id\":\"%1$s:printerNoDesc\","
+      "\"extensionId\":\"%s\","
+      "\"id\":\"%s:printerNoDesc\","
       "\"name\":\"Printer 2\""
       "}",
-      extension_id.c_str()));
+      extension_id.c_str(), extension_id.c_str()));
 
   ValidatePrinterListValue(printers, expected_printers);
 }
 
 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersAsyncSuccess) {
   extensions::ResultCatcher catcher;
 
   std::string extension_id;
   InitializePrinterProviderTestApp("api_test/printer_provider/request_printers",
                                    "ASYNC_RESPONSE", &extension_id);
   ASSERT_FALSE(extension_id.empty());
 
   base::RunLoop run_loop;
   base::ListValue printers;
 
   StartGetPrintersRequest(base::Bind(&AppendPrintersAndRunCallbackIfDone,
                                      &printers, run_loop.QuitClosure()));
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   run_loop.Run();
 
   std::vector<std::string> expected_printers;
   expected_printers.push_back(base::StringPrintf(
       "{"
       "\"description\":\"Test printer\","
-      "\"extensionId\":\"%1$s\","
-      "\"id\":\"%1$s:printer1\","
+      "\"extensionId\":\"%s\","
+      "\"id\":\"%s:printer1\","
       "\"name\":\"Printer 1\""
       "}",
-      extension_id.c_str()));
+      extension_id.c_str(), extension_id.c_str()));
 
   ValidatePrinterListValue(printers, expected_printers);
 }
 
 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersTwoExtensions) {
   extensions::ResultCatcher catcher;
 
   std::string extension_id_1;
   InitializePrinterProviderTestApp("api_test/printer_provider/request_printers",
                                    "OK", &extension_id_1);
@@ skipping 13 matching lines @@
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   run_loop.Run();
 
   std::vector<std::string> expected_printers;
   expected_printers.push_back(base::StringPrintf(
       "{"
       "\"description\":\"Test printer\","
-      "\"extensionId\":\"%1$s\","
-      "\"id\":\"%1$s:printer1\","
+      "\"extensionId\":\"%s\","
+      "\"id\":\"%s:printer1\","
       "\"name\":\"Printer 1\""
       "}",
-      extension_id_1.c_str()));
+      extension_id_1.c_str(), extension_id_1.c_str()));
   expected_printers.push_back(base::StringPrintf(
       "{"
-      "\"extensionId\":\"%1$s\","
-      "\"id\":\"%1$s:printerNoDesc\","
+      "\"extensionId\":\"%s\","
+      "\"id\":\"%s:printerNoDesc\","
       "\"name\":\"Printer 2\""
       "}",
-      extension_id_1.c_str()));
+      extension_id_1.c_str(), extension_id_1.c_str()));
   expected_printers.push_back(base::StringPrintf(
       "{"
       "\"description\":\"Test printer\","
-      "\"extensionId\":\"%1$s\","
-      "\"id\":\"%1$s:printer1\","
+      "\"extensionId\":\"%s\","
+      "\"id\":\"%s:printer1\","
       "\"name\":\"Printer 1\""
       "}",
-      extension_id_2.c_str()));
+      extension_id_2.c_str(), extension_id_2.c_str()));
   expected_printers.push_back(base::StringPrintf(
       "{"
-      "\"extensionId\":\"%1$s\","
-      "\"id\":\"%1$s:printerNoDesc\","
+      "\"extensionId\":\"%s\","
+      "\"id\":\"%s:printerNoDesc\","
       "\"name\":\"Printer 2\""
       "}",
-      extension_id_2.c_str()));
+      extension_id_2.c_str(), extension_id_2.c_str()));
 
   ValidatePrinterListValue(printers, expected_printers);
 }
 
 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest,
                        GetPrintersTwoExtensionsOneFails) {
   extensions::ResultCatcher catcher;
 
   std::string extension_id_1;
   InitializePrinterProviderTestApp("api_test/printer_provider/request_printers",
@@ skipping 14 matching lines @@
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   run_loop.Run();
 
   std::vector<std::string> expected_printers;
   expected_printers.push_back(base::StringPrintf(
       "{"
       "\"description\":\"Test printer\","
-      "\"extensionId\":\"%1$s\","
-      "\"id\":\"%1$s:printer1\","
+      "\"extensionId\":\"%s\","
+      "\"id\":\"%s:printer1\","
       "\"name\":\"Printer 1\""
       "}",
-      extension_id_2.c_str()));
+      extension_id_2.c_str(), extension_id_2.c_str()));
   expected_printers.push_back(base::StringPrintf(
       "{"
-      "\"extensionId\":\"%1$s\","
-      "\"id\":\"%1$s:printerNoDesc\","
+      "\"extensionId\":\"%s\","
+      "\"id\":\"%s:printerNoDesc\","
       "\"name\":\"Printer 2\""
       "}",
-      extension_id_2.c_str()));
+      extension_id_2.c_str(), extension_id_2.c_str()));
 
   ValidatePrinterListValue(printers, expected_printers);
 }
 
 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest,
                        GetPrintersTwoExtensionsOneWithNoListener) {
   extensions::ResultCatcher catcher;
 
   std::string extension_id_1;
   InitializePrinterProviderTestApp("api_test/printer_provider/request_printers",
@@ skipping 14 matching lines @@
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   run_loop.Run();
 
   std::vector<std::string> expected_printers;
   expected_printers.push_back(base::StringPrintf(
       "{"
       "\"description\":\"Test printer\","
-      "\"extensionId\":\"%1$s\","
-      "\"id\":\"%1$s:printer1\","
+      "\"extensionId\":\"%s\","
+      "\"id\":\"%s:printer1\","
       "\"name\":\"Printer 1\""
       "}",
-      extension_id_2.c_str()));
+      extension_id_2.c_str(), extension_id_2.c_str()));
   expected_printers.push_back(base::StringPrintf(
       "{"
-      "\"extensionId\":\"%1$s\","
-      "\"id\":\"%1$s:printerNoDesc\","
+      "\"extensionId\":\"%s\","
+      "\"id\":\"%s:printerNoDesc\","
       "\"name\":\"Printer 2\""
       "}",
-      extension_id_2.c_str()));
+      extension_id_2.c_str(), extension_id_2.c_str()));
 
   ValidatePrinterListValue(printers, expected_printers);
 }
 
 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersNoListener) {
   extensions::ResultCatcher catcher;
 
   std::string extension_id;
   InitializePrinterProviderTestApp("api_test/printer_provider/request_printers",
                                    "NO_LISTENER", &extension_id);
@@ skipping 70 matching lines @@
                                      &printers, run_loop.QuitClosure()));
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   run_loop.Run();
 
   EXPECT_TRUE(printers.empty());
 }
 
 }  // namespace