Copied  issue chromium:744987  to issue chromium:744990

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ee00115994fbb7a137380b02160ca2fcb9b8c20d

commit ee00115994fbb7a137380b02160ca2fcb9b8c20d
Author: Justin Carlson <justincarlson@chromium.org>
Date: Wed Aug 09 18:05:56 2017

Create CupsPrintersManager class. Also create associated unit tests. This change does not plumb this class in yet.

BUG= 744987 

Change-Id: I0451bf57e635cb8b812002e95686eaf190364968
Reviewed-on: https://chromium-review.googlesource.com/606550
Commit-Queue: Justin Carlson <justincarlson@chromium.org>
Reviewed-by: Sean Kau <skau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#493051}
[modify] https://crrev.com/ee00115994fbb7a137380b02160ca2fcb9b8c20d/chrome/browser/chromeos/BUILD.gn
[add] https://crrev.com/ee00115994fbb7a137380b02160ca2fcb9b8c20d/chrome/browser/chromeos/printing/cups_printers_manager.cc
[add] https://crrev.com/ee00115994fbb7a137380b02160ca2fcb9b8c20d/chrome/browser/chromeos/printing/cups_printers_manager.h
[add] https://crrev.com/ee00115994fbb7a137380b02160ca2fcb9b8c20d/chrome/browser/chromeos/printing/cups_printers_manager_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/41de7e17fb2912f17456aeb369539749dae2a8f0

commit 41de7e17fb2912f17456aeb369539749dae2a8f0
Author: Justin Carlson <justincarlson@chromium.org>
Date: Thu Aug 17 02:09:29 2017

Connect CupsPrintersManager, superceding SyncedPrintersManager.

Connect CupsPrintersManager to the UI.  Simplify USB detection so it
does *not* automatically attempt to save the configured printer; this
is now a normal settings flow.

Update the settings ui to go from discovery dialog -> complete if the
printer can be added without user input, or from discovery dialog ->
manufacturer/model dialog if the user needs to supply more
information.

Note that there were severe merge conflicts with 
https://chromium-review.googlesource.com/c/600890.  Resolving these 
conflicts involved moving much of the functionality from that change
into CupsPrintersManager.  The combined solution is (I believe)
significantly more elegant)

BUG= 744987 ,588234,755403

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ief41410f45ff7e3b20ca38e7972abf4bb7725a8a
Reviewed-on: https://chromium-review.googlesource.com/611103
Commit-Queue: Justin Carlson <justincarlson@chromium.org>
Reviewed-by: Xiaoqian Dai <xdai@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Reviewed-by: Sean Kau <skau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#495051}
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/chromeos/printing/combining_printer_detector.cc
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/chromeos/printing/combining_printer_detector_unittest.cc
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/chromeos/printing/cups_printers_manager.cc
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/chromeos/printing/cups_printers_manager.h
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/chromeos/printing/cups_printers_manager_unittest.cc
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/chromeos/printing/printer_detector.h
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/chromeos/printing/printer_event_tracker.cc
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/chromeos/printing/printer_event_tracker.h
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/chromeos/printing/printer_event_tracker_unittest.cc
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/chromeos/printing/usb_printer_detector.cc
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.js
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/resources/settings/printing_page/cups_edit_printer_dialog.js
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/resources/settings/printing_page/cups_printers_browser_proxy.js
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chromeos/printing/printer_configuration.cc
[modify] https://crrev.com/41de7e17fb2912f17456aeb369539749dae2a8f0/chromeos/printing/printer_configuration.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/6dbf7125d2957091e4c165ea089de89ae10d072e

commit 6dbf7125d2957091e4c165ea089de89ae10d072e
Author: Max Morin <maxmorin@chromium.org>
Date: Thu Aug 17 06:50:01 2017

Revert "Connect CupsPrintersManager, superceding SyncedPrintersManager."

This reverts commit 41de7e17fb2912f17456aeb369539749dae2a8f0.

Reason for revert: unit_tests failing on Linux ChromiumOS MSan bot:
https://luci-milo.appspot.com/buildbot/chromium.memory/Linux%20ChromiumOS%20MSan%20Tests/2380

Original change's description:
> Connect CupsPrintersManager, superceding SyncedPrintersManager.
> 
> Connect CupsPrintersManager to the UI.  Simplify USB detection so it
> does *not* automatically attempt to save the configured printer; this
> is now a normal settings flow.
> 
> Update the settings ui to go from discovery dialog -> complete if the
> printer can be added without user input, or from discovery dialog ->
> manufacturer/model dialog if the user needs to supply more
> information.
> 
> Note that there were severe merge conflicts with 
> https://chromium-review.googlesource.com/c/600890.  Resolving these 
> conflicts involved moving much of the functionality from that change
> into CupsPrintersManager.  The combined solution is (I believe)
> significantly more elegant)
> 
> BUG= 744987 ,588234,755403
> 
> Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
> Change-Id: Ief41410f45ff7e3b20ca38e7972abf4bb7725a8a
> Reviewed-on: https://chromium-review.googlesource.com/611103
> Commit-Queue: Justin Carlson <justincarlson@chromium.org>
> Reviewed-by: Xiaoqian Dai <xdai@chromium.org>
> Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
> Reviewed-by: Sean Kau <skau@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#495051}

TBR=michaelpg@chromium.org,xdai@chromium.org,skau@chromium.org,justincarlson@chromium.org

Change-Id: I916ac190ac420b48d7e7380e9a229c8927459cbf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  744987 , 588234, 755403
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Reviewed-on: https://chromium-review.googlesource.com/618566
Reviewed-by: Max Morin <maxmorin@chromium.org>
Commit-Queue: Max Morin <maxmorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#495095}
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/chromeos/printing/combining_printer_detector.cc
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/chromeos/printing/combining_printer_detector_unittest.cc
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/chromeos/printing/cups_printers_manager.cc
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/chromeos/printing/cups_printers_manager.h
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/chromeos/printing/cups_printers_manager_unittest.cc
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/chromeos/printing/printer_detector.h
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/chromeos/printing/printer_event_tracker.cc
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/chromeos/printing/printer_event_tracker.h
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/chromeos/printing/printer_event_tracker_unittest.cc
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/chromeos/printing/usb_printer_detector.cc
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.js
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/resources/settings/printing_page/cups_edit_printer_dialog.js
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/resources/settings/printing_page/cups_printers_browser_proxy.js
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chromeos/printing/printer_configuration.cc
[modify] https://crrev.com/6dbf7125d2957091e4c165ea089de89ae10d072e/chromeos/printing/printer_configuration.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5639cf6992298065a77ccc6102ed55bace500b8c

commit 5639cf6992298065a77ccc6102ed55bace500b8c
Author: Justin Carlson <justincarlson@chromium.org>
Date: Thu Aug 17 20:59:07 2017

Reland: "Connect CupsPrintersManager, superceding SyncedPrintersManager."

This reverts commit 6dbf7125d2957091e4c165ea089de89ae10d072e.

Reason for original revert: Original CL exposed (but did not cause) an unrelated error that
has since been fixed in https://chromium-review.googlesource.com/c/619327
 
With that fix landed, this cl now passes msan testing unchanged.

Original change's description:
> Revert "Connect CupsPrintersManager, superceding SyncedPrintersManager."
> 
> This reverts commit 41de7e17fb2912f17456aeb369539749dae2a8f0.
> 
> Reason for revert: unit_tests failing on Linux ChromiumOS MSan bot:
> https://luci-milo.appspot.com/buildbot/chromium.memory/Linux%20ChromiumOS%20MSan%20Tests/2380
> 
> Original change's description:
> > Connect CupsPrintersManager, superceding SyncedPrintersManager.
> > 
> > Connect CupsPrintersManager to the UI.  Simplify USB detection so it
> > does *not* automatically attempt to save the configured printer; this
> > is now a normal settings flow.
> > 
> > Update the settings ui to go from discovery dialog -> complete if the
> > printer can be added without user input, or from discovery dialog ->
> > manufacturer/model dialog if the user needs to supply more
> > information.
> > 
> > Note that there were severe merge conflicts with 
> > https://chromium-review.googlesource.com/c/600890.  Resolving these 
> > conflicts involved moving much of the functionality from that change
> > into CupsPrintersManager.  The combined solution is (I believe)
> > significantly more elegant)
> > 
> > BUG= 744987 ,588234,755403
> > 
> > Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
> > Change-Id: Ief41410f45ff7e3b20ca38e7972abf4bb7725a8a
> > Reviewed-on: https://chromium-review.googlesource.com/611103
> > Commit-Queue: Justin Carlson <justincarlson@chromium.org>
> > Reviewed-by: Xiaoqian Dai <xdai@chromium.org>
> > Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
> > Reviewed-by: Sean Kau <skau@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#495051}
> 
> TBR=michaelpg@chromium.org,xdai@chromium.org,skau@chromium.org,justincarlson@chromium.org
> 
> Change-Id: I916ac190ac420b48d7e7380e9a229c8927459cbf
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug:  744987 , 588234, 755403
> Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
> Reviewed-on: https://chromium-review.googlesource.com/618566
> Reviewed-by: Max Morin <maxmorin@chromium.org>
> Commit-Queue: Max Morin <maxmorin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#495095}


Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Iaf186a7a445e5d34cefa59564adab5b6c5d4562d
Bug:  744987 , 588234, 755403
Reviewed-on: https://chromium-review.googlesource.com/619466
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Reviewed-by: Sean Kau <skau@chromium.org>
Commit-Queue: Justin Carlson <justincarlson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#495316}
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/chromeos/printing/combining_printer_detector.cc
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/chromeos/printing/combining_printer_detector_unittest.cc
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/chromeos/printing/cups_printers_manager.cc
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/chromeos/printing/cups_printers_manager.h
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/chromeos/printing/cups_printers_manager_unittest.cc
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/chromeos/printing/printer_detector.h
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/chromeos/printing/printer_event_tracker.cc
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/chromeos/printing/printer_event_tracker.h
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/chromeos/printing/printer_event_tracker_unittest.cc
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/chromeos/printing/usb_printer_detector.cc
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.js
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/resources/settings/printing_page/cups_edit_printer_dialog.js
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/resources/settings/printing_page/cups_printers_browser_proxy.js
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chromeos/printing/printer_configuration.cc
[modify] https://crrev.com/5639cf6992298065a77ccc6102ed55bace500b8c/chromeos/printing/printer_configuration.h

This bug requires manual review: Reverts referenced in bugdroid comments after merge request.
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), ketakid@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

This is a dependency to merge https://crbug.com/588234

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9b08160f25b50d8a25542d726db3393f4fbac169

commit 9b08160f25b50d8a25542d726db3393f4fbac169
Author: Sean Kau <skau@chromium.org>
Date: Tue Aug 22 17:41:03 2017

Create CupsPrintersManager class. Also create associated unit tests. This change does not plumb this class in yet.

BUG= 744987 
TBR=justincarlson@chromium.org

(cherry picked from commit ee00115994fbb7a137380b02160ca2fcb9b8c20d)

Change-Id: I0451bf57e635cb8b812002e95686eaf190364968
Reviewed-on: https://chromium-review.googlesource.com/606550
Commit-Queue: Justin Carlson <justincarlson@chromium.org>
Reviewed-by: Sean Kau <skau@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#493051}
Reviewed-on: https://chromium-review.googlesource.com/626717
Cr-Commit-Position: refs/branch-heads/3163@{#757}
Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
[modify] https://crrev.com/9b08160f25b50d8a25542d726db3393f4fbac169/chrome/browser/chromeos/BUILD.gn
[add] https://crrev.com/9b08160f25b50d8a25542d726db3393f4fbac169/chrome/browser/chromeos/printing/cups_printers_manager.cc
[add] https://crrev.com/9b08160f25b50d8a25542d726db3393f4fbac169/chrome/browser/chromeos/printing/cups_printers_manager.h
[add] https://crrev.com/9b08160f25b50d8a25542d726db3393f4fbac169/chrome/browser/chromeos/printing/cups_printers_manager_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3a861f1f03d27f395a7213d019cd4fe6455c5b15

commit 3a861f1f03d27f395a7213d019cd4fe6455c5b15
Author: Sean Kau <skau@chromium.org>
Date: Tue Aug 22 17:42:49 2017

Reland: "Connect CupsPrintersManager, superceding SyncedPrintersManager."

This reverts commit 6dbf7125d2957091e4c165ea089de89ae10d072e.

Reason for original revert: Original CL exposed (but did not cause) an unrelated error that
has since been fixed in https://chromium-review.googlesource.com/c/619327

With that fix landed, this cl now passes msan testing unchanged.

Original change's description:
> Revert "Connect CupsPrintersManager, superceding SyncedPrintersManager."
>
> This reverts commit 41de7e17fb2912f17456aeb369539749dae2a8f0.
>
> Reason for revert: unit_tests failing on Linux ChromiumOS MSan bot:
> https://luci-milo.appspot.com/buildbot/chromium.memory/Linux%20ChromiumOS%20MSan%20Tests/2380
>
> Original change's description:
> > Connect CupsPrintersManager, superceding SyncedPrintersManager.
> >
> > Connect CupsPrintersManager to the UI.  Simplify USB detection so it
> > does *not* automatically attempt to save the configured printer; this
> > is now a normal settings flow.
> >
> > Update the settings ui to go from discovery dialog -> complete if the
> > printer can be added without user input, or from discovery dialog ->
> > manufacturer/model dialog if the user needs to supply more
> > information.
> >
> > Note that there were severe merge conflicts with
> > https://chromium-review.googlesource.com/c/600890.  Resolving these
> > conflicts involved moving much of the functionality from that change
> > into CupsPrintersManager.  The combined solution is (I believe)
> > significantly more elegant)
> >
> > BUG= 744987 ,588234,755403
> >
> > Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
> > Change-Id: Ief41410f45ff7e3b20ca38e7972abf4bb7725a8a
> > Reviewed-on: https://chromium-review.googlesource.com/611103
> > Commit-Queue: Justin Carlson <justincarlson@chromium.org>
> > Reviewed-by: Xiaoqian Dai <xdai@chromium.org>
> > Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
> > Reviewed-by: Sean Kau <skau@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#495051}
>
> TBR=michaelpg@chromium.org,xdai@chromium.org,skau@chromium.org,justincarlson@chromium.org
>
> Change-Id: I916ac190ac420b48d7e7380e9a229c8927459cbf
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug:  744987 , 588234, 755403
> Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
> Reviewed-on: https://chromium-review.googlesource.com/618566
> Reviewed-by: Max Morin <maxmorin@chromium.org>
> Commit-Queue: Max Morin <maxmorin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#495095}

TBR=justincarlson@chromium.org

(cherry picked from commit 5639cf6992298065a77ccc6102ed55bace500b8c)

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Iaf186a7a445e5d34cefa59564adab5b6c5d4562d
Bug:  744987 , 588234, 755403
Reviewed-on: https://chromium-review.googlesource.com/619466
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Reviewed-by: Sean Kau <skau@chromium.org>
Commit-Queue: Justin Carlson <justincarlson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#495316}
Reviewed-on: https://chromium-review.googlesource.com/626719
Cr-Commit-Position: refs/branch-heads/3163@{#758}
Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/chromeos/printing/combining_printer_detector.cc
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/chromeos/printing/combining_printer_detector_unittest.cc
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/chromeos/printing/cups_printers_manager.cc
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/chromeos/printing/cups_printers_manager.h
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/chromeos/printing/cups_printers_manager_unittest.cc
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/chromeos/printing/printer_detector.h
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/chromeos/printing/printer_event_tracker.cc
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/chromeos/printing/printer_event_tracker.h
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/chromeos/printing/printer_event_tracker_unittest.cc
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/chromeos/printing/usb_printer_detector.cc
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.js
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/resources/settings/printing_page/cups_edit_printer_dialog.js
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/resources/settings/printing_page/cups_printers_browser_proxy.js
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chromeos/printing/printer_configuration.cc
[modify] https://crrev.com/3a861f1f03d27f395a7213d019cd4fe6455c5b15/chromeos/printing/printer_configuration.h

Approving merge to M61 and M62.

Whoops.  Looks like this is already merged...