Add onGetUsbPrinterInfoRequested event to printerProvider API.

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/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "device/usb/mock_usb_device.h"
+#include "device/usb/mock_usb_service.h"
 #include "extensions/browser/api/printer_provider/printer_provider_api.h"
 #include "extensions/browser/api/printer_provider/printer_provider_api_factory.h"
 #include "extensions/browser/api/printer_provider/printer_provider_print_job.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/value_builder.h"
 #include "extensions/shell/test/shell_apitest.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using device::MockUsbDevice;
+using device::MockUsbService;
+
 namespace extensions {
 
 namespace {
 
 // Callback for PrinterProviderAPI::DispatchGetPrintersRequested calls.
 // It appends items in |printers| to |*printers_out|. If |done| is set, it runs
 // |callback|.
 void AppendPrintersAndRunCallbackIfDone(base::ListValue* printers_out,
                                         const base::Closure& callback,
                                         const base::ListValue& printers,
@@ skipping 26 matching lines @@
 // It saves reported |value| as JSON string to |*result| and runs |callback|.
 void RecordDictAndRunCallback(std::string* result,
                               const base::Closure& callback,
                               const base::DictionaryValue& value) {
   JSONStringValueSerializer serializer(result);
   EXPECT_TRUE(serializer.Serialize(value));
   if (!callback.is_null())
     callback.Run();
 }
 
+// Callback for PrinterProvider::DispatchGrantUsbPrinterAccess calls.
+// It expects |value| to equal |expected_value| and runs |callback|.
+void ExpectValueAndRunCallback(const base::Value* expected_value,
+                               const base::Closure& callback,
+                               const base::DictionaryValue& value) {
+  EXPECT_TRUE(value.Equals(expected_value));
+  if (!callback.is_null()) {
+    callback.Run();
+  }
+}
+
 // Tests for chrome.printerProvider API.
 class PrinterProviderApiTest : public ShellApiTest {
  public:
   enum PrintRequestDataType {
     PRINT_REQUEST_DATA_TYPE_NOT_SET,
     PRINT_REQUEST_DATA_TYPE_FILE,
     PRINT_REQUEST_DATA_TYPE_FILE_DELETED,
     PRINT_REQUEST_DATA_TYPE_BYTES
   };
 
   PrinterProviderApiTest() {}
   ~PrinterProviderApiTest() override {}
 
   void StartGetPrintersRequest(
       const PrinterProviderAPI::GetPrintersCallback& callback) {
     PrinterProviderAPIFactory::GetInstance()
         ->GetForBrowserContext(browser_context())
         ->DispatchGetPrintersRequested(callback);
   }
 
+  void StartGrantUsbPrinterAccess(
+      const std::string& extension_id,
+      int device_id,
+      const PrinterProviderAPI::UsbAccessGrantedCallback& callback) {
+    PrinterProviderAPIFactory::GetInstance()
+        ->GetForBrowserContext(browser_context())
+        ->DispatchGrantUsbPrinterAccess(extension_id, device_id, callback);
+  }
+
   void StartPrintRequestWithNoData(
       const std::string& extension_id,
       const PrinterProviderAPI::PrintCallback& callback) {
     PrinterProviderPrintJob job;
     job.printer_id = extension_id + ":printer_id";
     job.ticket_json = "{}";
     job.content_type = "application/pdf";
 
     PrinterProviderAPIFactory::GetInstance()
         ->GetForBrowserContext(browser_context())
@@ skipping 171 matching lines @@
   // chrome.printerProvider.onGetPritersRequested is the same as the set of
   // printers in |expected_printers|. |expected_printers| contains list of
   // printer objects formatted as a JSON string. It is assumed that the values
   // in |expoected_printers| are unique.
   void ValidatePrinterListValue(
       const base::ListValue& printers,
       const ScopedVector<base::Value>& expected_printers) {
     ASSERT_EQ(expected_printers.size(), printers.GetSize());
     for (const base::Value* printer_value : expected_printers) {
       EXPECT_TRUE(printers.Find(*printer_value) != printers.end())
-          << "Unabe to find " << *printer_value << " in " << printers;
+          << "Unable to find " << *printer_value << " in " << printers;
     }
   }
 
+ protected:
+  MockUsbService usb_service_;
+
  private:
   // Initializes |data_dir_| if needed and creates a file in it containing
   // provided data.
   bool CreateTempFileWithContents(const char* data,
                                   int size,
                                   base::FilePath* path,
                                   base::File::Info* file_info) {
     if (!data_dir_.IsValid() && !data_dir_.CreateUniqueTempDir())
       return false;
 
@@ skipping 453 matching lines @@
   StartGetPrintersRequest(base::Bind(&AppendPrintersAndRunCallbackIfDone,
                                      &printers, run_loop.QuitClosure()));
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   run_loop.Run();
 
   EXPECT_TRUE(printers.empty());
 }
 
+IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GrantUsbPrinterAccess) {
+  ResultCatcher catcher;
+  usb_service_.AddDevice(new MockUsbDevice(0, 0, "Google", "USB Printer", ""));
+
+  std::string extension_id;
+  InitializePrinterProviderTestApp("api_test/printer_provider/usb_printers",
+                                   "OK", &extension_id);
+  ASSERT_FALSE(extension_id.empty());
+
+  base::ListValue printers;
+  {
+    base::RunLoop run_loop;
+    StartGetPrintersRequest(base::Bind(&AppendPrintersAndRunCallbackIfDone,
+                                       &printers, run_loop.QuitClosure()));
+    run_loop.Run();
+  }
+
+  ScopedVector<base::Value> expected_printers;
+  ValidatePrinterListValue(printers, expected_printers);
+
+  scoped_ptr<base::Value> expected_printer_info(
+      DictionaryBuilder()
+          .Set("description", "This printer is a USB device.")
+          .Set("id", "granted-0")
+          .Set("name", "Test Printer")
+          .Build());
+  {
+    base::RunLoop run_loop;
+    StartGrantUsbPrinterAccess(
+        extension_id, 0,
+        base::Bind(&ExpectValueAndRunCallback, expected_printer_info.get(),
+                   run_loop.QuitClosure()));
+    run_loop.Run();
+  }
+
+  printers.Clear();
+  {
+    base::RunLoop run_loop;
+    StartGetPrintersRequest(base::Bind(&AppendPrintersAndRunCallbackIfDone,
+                                       &printers, run_loop.QuitClosure()));
+    run_loop.Run();
+  }
+
+  expected_printers.push_back(
+      DictionaryBuilder()
+          .Set("description", "This printer is a USB device.")
+          .Set("extensionId", extension_id)
+          .Set("extensionName", "Test USB printer provider")
+          .Set("id",
+               base::StringPrintf("%s:enumerated-0", extension_id.c_str()))
+          .Set("name", "Test Printer")
+          .Build());
+
+  ValidatePrinterListValue(printers, expected_printers);
+
+  ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
+}

[tbarzic, 2015/05/27 00:11:03]

can you add a test case for when the extension doesn't have onUsbAccessGranted
event listener

[Reilly Grant (use Gerrit), 2015/05/28 21:04:10]

Done.

+
 }  // namespace
 
 }  // namespace extensions