List printers managed by extensions in print preview

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 54 matching lines @@
   void StartGetPrintersRequest(
       const PrinterProviderAPI::GetPrintersCallback& callback) {
     PrinterProviderAPI::GetFactoryInstance()
         ->Get(browser_context())
         ->DispatchGetPrintersRequested(callback);
   }
 
   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(
       const std::string& extension_id,
       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
   // |test_param|.
   // When the app's background page is loaded, the app will send 'loaded'
   // message. As a response to the message it will expect string message
   // specifying the test that should be run. When the app initializes its state
   // (e.g. registers listener for a chrome.printerProvider event) it will send
   // message 'ready', at which point the test may be started.
   // If the app is successfully initialized, |*extension_id_out| will be set to
@@ skipping 159 matching lines @@
 
   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\":\"%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);
 }
 
 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\":\"%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);
 }
 
 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 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\":\"%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);
 }
 
 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest,
                        GetPrintersTwoExtensionsOneFails) {
   extensions::ResultCatcher catcher;
 
   std::string extension_id_1;
   InitializePrinterProviderTestApp("api_test/printer_provider/request_printers",
@@ skipping 15 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\":\"%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);
 }
 
 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest,
                        GetPrintersTwoExtensionsOneWithNoListener) {
   extensions::ResultCatcher catcher;
 
   std::string extension_id_1;
   InitializePrinterProviderTestApp("api_test/printer_provider/request_printers",
@@ skipping 15 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\":\"%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);
 }
 
 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