BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

6 files changed, 39 insertions, 39 deletions

diff --git a/chromium/extensions/browser/api/document_scan/BUILD.gn b/chromium/extensions/browser/api/document_scan/BUILD.gn
index 7ac8b406a51..141506a87b5 100644
--- a/chromium/extensions/browser/api/document_scan/BUILD.gn
+++ b/chromium/extensions/browser/api/document_scan/BUILD.gn
@@ -13,15 +13,22 @@ source_set("document_scan") {
     "document_scan_api.h",
     "document_scan_interface.cc",
     "document_scan_interface.h",
-    "document_scan_interface_chromeos.cc",
-    "document_scan_interface_chromeos.h",
   ]
 
-  if (!is_chromeos) {
+  if (is_chromeos) {
+    sources += [
+      "document_scan_interface_chromeos.cc",
+      "document_scan_interface_chromeos.h",
+    ]
+  } else {
     sources += [ "document_scan_interface_nonchromeos.cc" ]
   }
 
   deps = [ "//extensions/common/api" ]
 
+  if (is_chromeos) {
+    deps += [ "//chromeos/dbus:lorgnette_proto" ]
+  }
+
   public_deps = [ "//extensions/browser:browser_sources" ]
 }
diff --git a/chromium/extensions/browser/api/document_scan/document_scan_api.h b/chromium/extensions/browser/api/document_scan/document_scan_api.h
index ba490af6616..3044227c624 100644
--- a/chromium/extensions/browser/api/document_scan/document_scan_api.h
+++ b/chromium/extensions/browser/api/document_scan/document_scan_api.h
@@ -9,7 +9,6 @@
 #include <string>
 #include <vector>
 
-#include "base/macros.h"
 #include "extensions/browser/api/document_scan/document_scan_interface.h"
 #include "extensions/browser/extension_function.h"
 #include "extensions/common/api/document_scan.h"
@@ -21,6 +20,8 @@ class DocumentScanScanFunction : public ExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("documentScan.scan", DOCUMENT_SCAN_SCAN)
   DocumentScanScanFunction();
+  DocumentScanScanFunction(const DocumentScanScanFunction&) = delete;
+  DocumentScanScanFunction& operator=(const DocumentScanScanFunction&) = delete;
 
  protected:
   ~DocumentScanScanFunction() override;
@@ -41,8 +42,6 @@ class DocumentScanScanFunction : public ExtensionFunction {
 
   std::unique_ptr<document_scan::Scan::Params> params_;
   std::unique_ptr<DocumentScanInterface> document_scan_interface_;
-
-  DISALLOW_COPY_AND_ASSIGN(DocumentScanScanFunction);
 };
 
 }  // namespace api
diff --git a/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos.cc b/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos.cc
index 2517319a22b..11a5169008e 100644
--- a/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos.cc
+++ b/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos.cc
@@ -9,6 +9,7 @@
 
 #include "base/base64.h"
 #include "base/bind.h"
+#include "base/logging.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/lorgnette_manager_client.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ -42,25 +43,15 @@ void DocumentScanInterfaceChromeos::ListScanners(
 
 void DocumentScanInterfaceChromeos::OnScannerListReceived(
     ListScannersResultsCallback callback,
-    base::Optional<chromeos::LorgnetteManagerClient::ScannerTable> scanners) {
+    base::Optional<lorgnette::ListScannersResponse> response) {
   std::vector<ScannerDescription> scanner_descriptions;
-  if (scanners.has_value()) {
-    for (const auto& scanner : scanners.value()) {
+  if (response) {
+    for (const auto& scanner : response->scanners()) {
       ScannerDescription description;
-      description.name = scanner.first;
-      const auto& entry = scanner.second;
-      auto info_it = entry.find(lorgnette::kScannerPropertyManufacturer);
-      if (info_it != entry.end()) {
-        description.manufacturer = info_it->second;
-      }
-      info_it = entry.find(lorgnette::kScannerPropertyModel);
-      if (info_it != entry.end()) {
-        description.model = info_it->second;
-      }
-      info_it = entry.find(lorgnette::kScannerPropertyType);
-      if (info_it != entry.end()) {
-        description.scanner_type = info_it->second;
-      }
+      description.name = scanner.name();
+      description.manufacturer = scanner.manufacturer();
+      description.model = scanner.model();
+      description.scanner_type = scanner.type();
       description.image_mime_type = kScannerImageMimeTypePng;
       scanner_descriptions.push_back(description);
     }
diff --git a/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos.h b/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos.h
index b25eaa39fa5..ebbc0031dce 100644
--- a/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos.h
+++ b/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos.h
@@ -7,9 +7,8 @@
 
 #include <string>
 
-#include "base/macros.h"
 #include "base/optional.h"
-#include "chromeos/dbus/lorgnette_manager_client.h"
+#include "chromeos/dbus/lorgnette/lorgnette_service.pb.h"
 #include "extensions/browser/api/document_scan/document_scan_interface.h"
 
 namespace extensions {
@@ -18,6 +17,9 @@ namespace api {
 class DocumentScanInterfaceChromeos : public DocumentScanInterface {
  public:
   DocumentScanInterfaceChromeos();
+  DocumentScanInterfaceChromeos(const DocumentScanInterfaceChromeos&) = delete;
+  DocumentScanInterfaceChromeos& operator=(
+      const DocumentScanInterfaceChromeos&) = delete;
   ~DocumentScanInterfaceChromeos() override;
 
   // DocumentScanInterface:
@@ -30,11 +32,9 @@ class DocumentScanInterfaceChromeos : public DocumentScanInterface {
  private:
   void OnScannerListReceived(
       ListScannersResultsCallback callback,
-      base::Optional<chromeos::LorgnetteManagerClient::ScannerTable> scanners);
+      base::Optional<lorgnette::ListScannersResponse> response);
   void OnScanCompleted(ScanResultsCallback callback,
                        base::Optional<std::string> image_data);
-
-  DISALLOW_COPY_AND_ASSIGN(DocumentScanInterfaceChromeos);
 };
 
 }  // namespace api
diff --git a/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos_unittest.cc b/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos_unittest.cc
index 0d99d9a1f2f..f969fb6434a 100644
--- a/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos_unittest.cc
+++ b/chromium/extensions/browser/api/document_scan/document_scan_interface_chromeos_unittest.cc
@@ -46,11 +46,14 @@ TEST_F(DocumentScanInterfaceChromeosTest, ListScanners) {
   constexpr const char* kScannerManufacturer = "Jacques-Louis David";
   constexpr const char* kScannerModel = "Le Havre";
   constexpr const char* kScannerType = "Impressionism";
-  GetLorgnetteManagerClient()->AddScannerTableEntry(
-      kScannerName,
-      {{lorgnette::kScannerPropertyManufacturer, kScannerManufacturer},
-       {lorgnette::kScannerPropertyModel, kScannerModel},
-       {lorgnette::kScannerPropertyType, kScannerType}});
+  lorgnette::ScannerInfo scanner;
+  scanner.set_name(kScannerName);
+  scanner.set_manufacturer(kScannerManufacturer);
+  scanner.set_model(kScannerModel);
+  scanner.set_type(kScannerType);
+  lorgnette::ListScannersResponse response;
+  *response.add_scanners() = std::move(scanner);
+  GetLorgnetteManagerClient()->SetListScannersResponse(response);
 
   base::RunLoop run_loop;
   scan_interface_.ListScanners(base::BindOnce(
diff --git a/chromium/extensions/browser/api/document_scan/document_scan_interface_nonchromeos.cc b/chromium/extensions/browser/api/document_scan/document_scan_interface_nonchromeos.cc
index e5a0ca0b18f..16b476599b5 100644
--- a/chromium/extensions/browser/api/document_scan/document_scan_interface_nonchromeos.cc
+++ b/chromium/extensions/browser/api/document_scan/document_scan_interface_nonchromeos.cc
@@ -4,7 +4,6 @@
 
 #include <utility>
 
-#include "base/macros.h"
 #include "extensions/browser/api/document_scan/document_scan_interface.h"
 
 namespace {
@@ -18,8 +17,12 @@ namespace api {
 
 class DocumentScanInterfaceImpl : public DocumentScanInterface {
  public:
-  DocumentScanInterfaceImpl() {}
-  ~DocumentScanInterfaceImpl() override {}
+  DocumentScanInterfaceImpl() = default;
+  ~DocumentScanInterfaceImpl() override = default;
+
+  DocumentScanInterfaceImpl(const DocumentScanInterfaceImpl&) = delete;
+  DocumentScanInterfaceImpl& operator=(const DocumentScanInterfaceImpl&) =
+      delete;
 
   void ListScanners(ListScannersResultsCallback callback) override {
     std::move(callback).Run(std::vector<ScannerDescription>(), "");
@@ -30,9 +33,6 @@ class DocumentScanInterfaceImpl : public DocumentScanInterface {
             ScanResultsCallback callback) override {
     std::move(callback).Run("", "", kScanFunctionNotImplementedError);
   }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(DocumentScanInterfaceImpl);
 };
 
 // static