Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: extensions/browser/api/printer_provider/printer_provider_apitest.cc

Issue 902643002: Revert "Enable positional parameters for base::vsnprintf and base::vswprintf on Windows." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: extension Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/setup/install.cc ('k') | remoting/host/ipc_util_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/printer_provider/printer_provider_apitest.cc
diff --git a/extensions/browser/api/printer_provider/printer_provider_apitest.cc b/extensions/browser/api/printer_provider/printer_provider_apitest.cc
index 0dd8df0c137a70c6526135bbd4daccf3ba44a05f..30840b3b19ad300d82f5f626a60798a0439a1a89 100644
--- a/extensions/browser/api/printer_provider/printer_provider_apitest.cc
+++ b/extensions/browser/api/printer_provider/printer_provider_apitest.cc
@@ -267,18 +267,18 @@ IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersSuccess) {
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);
}
@@ -305,11 +305,11 @@ IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersAsyncSuccess) {
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);
}
@@ -343,33 +343,33 @@ IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersTwoExtensions) {
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);
}
@@ -404,18 +404,18 @@ IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest,
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);
}
@@ -450,18 +450,18 @@ IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest,
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);
}
« no previous file with comments | « chrome/installer/setup/install.cc ('k') | remoting/host/ipc_util_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698