Introduce PrintersMap::Remove method

- Adds a Remove() method to remove a printer from a given class.

Change-Id: Ib229e42b472a0d9cf637c116d1f35ae50d5a9a6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1575863
Commit-Queue: Bailey Berro <baileyberro@chromium.org>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#657356}

chrome/browser/chromeos/printing/printers_map.cc

@@ -114,6 +114,16 @@ std::vector<Printer> PrintersMap::GetSecurePrinters(
   return result;
 }
 
+void PrintersMap::Remove(PrinterClass printer_class,
+                         const std::string& printer_id) {
+  if (!IsPrinterInClass(printer_class, printer_id)) {
+    return;
+  }
+  printers_[printer_class].erase(printer_id);
+
+  DCHECK(!IsExistingPrinter(printer_id));
+}
+
 bool PrintersMap::HasPrintersInClass(PrinterClass printer_class) const {
   return base::ContainsKey(printers_, printer_class);
 }

chrome/browser/chromeos/printing/printers_map.h

@@ -52,6 +52,10 @@ class PrintersMap {
   void ReplacePrintersInClass(PrinterClass printer_class,
                               const std::vector<Printer>& printers);
 
+  // Removes printer with |printer_id| from |printer_class|. This is a no-op if
+  // |printer_id| doesn't exist in printer_class.
+  void Remove(PrinterClass printer_class, const std::string& printer_id);
+
  private:
   // Returns true if |printer_class| exists and contains at least 1 printer.
   bool HasPrintersInClass(PrinterClass printer_class) const;

chrome/browser/chromeos/printing/printers_map_unittest.cc

@@ -290,4 +290,57 @@ TEST_F(PrintersMapTest, ReplacePrintersInClassOverwritesPrinters) {
   EXPECT_EQ(2u, restored_printers.size());
 }
 
+TEST_F(PrintersMapTest, RemoveSucceedsOnPrinterInClass) {
+  PrintersMap printers_map;
+
+  const std::string printer_id = "id1";
+
+  printers_map.Insert(PrinterClass::kEnterprise, Printer(printer_id));
+
+  auto printer = printers_map.Get(printer_id);
+  EXPECT_TRUE(printer);
+  EXPECT_EQ(printer_id, printer->id());
+
+  printers_map.Remove(PrinterClass::kEnterprise, printer_id);
+
+  printer = printers_map.Get(printer_id);
+  EXPECT_FALSE(printer);
+}
+
+TEST_F(PrintersMapTest, RemoveDoesNothingOnPrinterNotInClass) {
+  PrintersMap printers_map;
+
+  const std::string printer_id = "id1";
+
+  printers_map.Insert(PrinterClass::kEnterprise, Printer(printer_id));
+
+  auto printer = printers_map.Get(printer_id);
+  EXPECT_TRUE(printer);
+  EXPECT_EQ(printer_id, printer->id());
+
+  // Call remove using a different class, same printer_id and verify the printer
+  // is not rmemoved.
+  printers_map.Remove(PrinterClass::kDiscovered, printer_id);
+
+  printer = printers_map.Get(printer_id);
+  EXPECT_TRUE(printer);
+  EXPECT_EQ(printer_id, printer->id());
+}
+
+TEST_F(PrintersMapTest, RemoveDoesNothingOnUnknownPrinter) {
+  PrintersMap printers_map;
+
+  const std::string printer_id = "id";
+
+  printers_map.Insert(PrinterClass::kEnterprise, Printer(printer_id));
+
+  EXPECT_TRUE(printers_map.Get(printer_id));
+
+  // Call remove using a printer that does not exist in any class and verify the
+  // other printers are not changed.
+  printers_map.Remove(PrinterClass::kDiscovered, "random_id");
+
+  EXPECT_TRUE(printers_map.Get(printer_id));
+}
+
 }  // namespace chromeos