List printers managed by extensions in print preview

extensions/browser/api/printer_provider/printer_provider_apitest.cc

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 3be5c5636b58d68f9e002af280303e700d9b4ee6..30840b3b19ad300d82f5f626a60798a0439a1a89 100644
--- a/extensions/browser/api/printer_provider/printer_provider_apitest.cc
+++ b/extensions/browser/api/printer_provider/printer_provider_apitest.cc
@@ -72,14 +72,14 @@ class PrinterProviderApiTest : public extensions::ShellApiTest {
   void StartPrintRequest(const std::string& extension_id,
                          const PrinterProviderAPI::PrintCallback& callback) {
     PrinterProviderAPI::PrintJob job;
-    job.printer_id = "printer_id";
+    job.printer_id = extension_id + ":printer_id";
     job.ticket_json = "{}";
     job.content_type = "content_type";
     job.document_bytes = "bytes";
 
     PrinterProviderAPI::GetFactoryInstance()
         ->Get(browser_context())
-        ->DispatchPrintRequested(extension_id, job, callback);
+        ->DispatchPrintRequested(job, callback);
   }
 
   void StartCapabilityRequest(
@@ -87,7 +87,8 @@ class PrinterProviderApiTest : public extensions::ShellApiTest {
       const PrinterProviderAPI::GetCapabilityCallback& callback) {
     PrinterProviderAPI::GetFactoryInstance()
         ->Get(browser_context())
-        ->DispatchGetCapabilityRequested(extension_id, "printer_id", callback);
+        ->DispatchGetCapabilityRequested(extension_id + ":printer_id",
+                                         callback);
   }
 
   // Loads chrome.printerProvider test app and initializes is for test
@@ -267,17 +268,17 @@ IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersSuccess) {
       "{"
       "\"description\":\"Test printer\","
       "\"extensionId\":\"%s\","
-      "\"id\":\"printer1\","
+      "\"id\":\"%s:printer1\","

[Aleksey Shlyapnikov, 2015/02/04 18:50:27]

I think %1$s refers to the first parameter, so you won't need to repeat it
twice.

[tbarzic, 2015/02/04 19:27:41]

Done.

[Nico, 2015/02/06 00:46:22]

(fyi: https://codereview.chromium.org/902643002/ undoes this. strange
coincidence that this change happened on the same day i'm cq'ing my change, as
this feature has historically been used very rarely in the chrome codebase)

       "\"name\":\"Printer 1\""
       "}",
-      extension_id.c_str()));
+      extension_id.c_str(), extension_id.c_str()));
   expected_printers.push_back(base::StringPrintf(
       "{"
       "\"extensionId\":\"%s\","
-      "\"id\":\"printerNoDesc\","
+      "\"id\":\"%s:printerNoDesc\","
       "\"name\":\"Printer 2\""
       "}",
-      extension_id.c_str()));
+      extension_id.c_str(), extension_id.c_str()));
 
   ValidatePrinterListValue(printers, expected_printers);
 }
@@ -305,10 +306,10 @@ IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersAsyncSuccess) {
       "{"
       "\"description\":\"Test printer\","
       "\"extensionId\":\"%s\","
-      "\"id\":\"printer1\","
+      "\"id\":\"%s:printer1\","
       "\"name\":\"Printer 1\""
       "}",
-      extension_id.c_str()));
+      extension_id.c_str(), extension_id.c_str()));
 
   ValidatePrinterListValue(printers, expected_printers);
 }
@@ -343,32 +344,32 @@ IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersTwoExtensions) {
       "{"
       "\"description\":\"Test printer\","
       "\"extensionId\":\"%s\","
-      "\"id\":\"printer1\","
+      "\"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\":\"%s\","
-      "\"id\":\"printerNoDesc\","
+      "\"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\":\"%s\","
-      "\"id\":\"printer1\","
+      "\"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\":\"%s\","
-      "\"id\":\"printerNoDesc\","
+      "\"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,17 +405,17 @@ IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest,
       "{"
       "\"description\":\"Test printer\","
       "\"extensionId\":\"%s\","
-      "\"id\":\"printer1\","
+      "\"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\":\"%s\","
-      "\"id\":\"printerNoDesc\","
+      "\"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,17 +451,17 @@ IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest,
       "{"
       "\"description\":\"Test printer\","
       "\"extensionId\":\"%s\","
-      "\"id\":\"printer1\","
+      "\"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\":\"%s\","
-      "\"id\":\"printerNoDesc\","
+      "\"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);
 }