Use printer id to populate CUPS instead of printer name.

chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc

 // Copyright 2016 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 "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 164 matching lines @@
   CHECK(printer_dict->GetString("printerModel", &printer_model));
   CHECK(printer_dict->GetString("printerAddress", &printer_address));
   CHECK(printer_dict->GetString("printerProtocol", &printer_protocol));
   // printerQueue might be null for a printer whose protocol is not 'LPD'.
   printer_dict->GetString("printerQueue", &printer_queue);
   // printerPPDPath might be null for an auto-discovered printer.
   printer_dict->GetString("printerPPDPath", &printer_ppd_path);
   std::string printer_uri =
       printer_protocol + "://" + printer_address + "/" + printer_queue;
 
-  std::unique_ptr<Printer> printer = base::MakeUnique<Printer>();
-  printer->set_id(printer_id);
+  std::unique_ptr<Printer> printer = base::MakeUnique<Printer>(printer_id);
+  printer_id = printer->id();
   printer->set_display_name(printer_name);
   printer->set_description(printer_description);
   printer->set_manufacturer(printer_manufacturer);
   printer->set_model(printer_model);
   printer->set_uri(printer_uri);
+  if (!printer_ppd_path.empty()) {
+    printer->mutable_ppd_reference()->user_supplied_ppd_url = printer_ppd_path;
+  } else if (!printer_manufacturer.empty() && !printer_model.empty()) {
+    Printer::PpdReference* ppd = printer->mutable_ppd_reference();
+    ppd->effective_manufacturer = printer_manufacturer;
+    ppd->effective_model = printer_model;
+  }
 
   chromeos::DebugDaemonClient* client =
       chromeos::DBusThreadManager::Get()->GetDebugDaemonClient();
   client->CupsAddPrinter(
-      printer_name, printer_uri,
-      printer_ppd_path,
-      printer_ppd_path.empty() ? true : false,       // ipp everywhere
+      printer_id,                               // record id
+      printer_uri,                              // uri
+      printer_ppd_path,                         // ppd location
+      printer_ppd_path.empty() ? true : false,  // ipp everywhere
       base::Bind(&CupsPrintersHandler::OnAddedPrinter,
                  weak_factory_.GetWeakPtr(), base::Passed(std::move(printer))),
       base::Bind(&CupsPrintersHandler::OnAddPrinterError,
                  weak_factory_.GetWeakPtr()));
 }
 
 void CupsPrintersHandler::OnAddedPrinter(std::unique_ptr<Printer> printer,
                                          bool success) {
   std::string printer_name = printer->display_name();
   if (success) {
@@ skipping 73 matching lines @@
                          *printers_list);
 }
 
 void CupsPrintersHandler::OnDiscoveryDone() {
   CallJavascriptFunction("cr.webUIListenerCallback",
                          base::StringValue("on-printer-discovery-done"));
 }
 
 }  // namespace settings
 }  // namespace chromeos