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

commit 5ab622df7c99bbdcbc0e855c55c10c1aa2cc2388
Author: jdufault <jdufault@chromium.org>
Date: Mon Jul 18 20:30:21 2016

Add quick unlock private interface

BUG= 627928 

Review-Url: https://codereview.chromium.org/2142423003
Cr-Commit-Position: refs/heads/master@{#406081}

[modify] https://crrev.com/5ab622df7c99bbdcbc0e855c55c10c1aa2cc2388/third_party/closure_compiler/interfaces/compiled_resources2.gyp
[add] https://crrev.com/5ab622df7c99bbdcbc0e855c55c10c1aa2cc2388/third_party/closure_compiler/interfaces/quick_unlock_private_interface.js

https://codereview.chromium.org/2157673002/

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

commit 12d223ad3993032f0b5339187d1e6beaa86002af
Author: jdufault <jdufault@chromium.org>
Date: Fri Oct 14 18:04:33 2016

Browser tests for the quick_unlock settings pages.

BUG= 627928 
TBR=dbeam@
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2157673002
Cr-Commit-Position: refs/heads/master@{#425386}

[modify] https://crrev.com/12d223ad3993032f0b5339187d1e6beaa86002af/chrome/browser/resources/options_resources.grd
[modify] https://crrev.com/12d223ad3993032f0b5339187d1e6beaa86002af/chrome/browser/resources/settings/icons.html
[modify] https://crrev.com/12d223ad3993032f0b5339187d1e6beaa86002af/chrome/browser/resources/settings/people_page/lock_screen.html
[modify] https://crrev.com/12d223ad3993032f0b5339187d1e6beaa86002af/chrome/browser/resources/settings/people_page/lock_state_behavior.js
[modify] https://crrev.com/12d223ad3993032f0b5339187d1e6beaa86002af/chrome/browser/resources/settings/people_page/password_prompt_dialog.js
[delete] https://crrev.com/f0958ace2dce08c20a3e30b823cdca7e5b1d157c/chrome/browser/resources/settings/people_page/quick_unlock_choose_method.js
[modify] https://crrev.com/12d223ad3993032f0b5339187d1e6beaa86002af/chrome/browser/resources/settings/people_page/setup_pin_dialog.html
[modify] https://crrev.com/12d223ad3993032f0b5339187d1e6beaa86002af/chrome/browser/resources/settings/people_page/setup_pin_dialog.js
[modify] https://crrev.com/12d223ad3993032f0b5339187d1e6beaa86002af/chrome/browser/ui/webui/options/options_ui.cc
[modify] https://crrev.com/12d223ad3993032f0b5339187d1e6beaa86002af/chrome/test/data/webui/settings/cr_settings_browsertest.js
[add] https://crrev.com/12d223ad3993032f0b5339187d1e6beaa86002af/chrome/test/data/webui/settings/fake_quick_unlock_private.js
[add] https://crrev.com/12d223ad3993032f0b5339187d1e6beaa86002af/chrome/test/data/webui/settings/quick_unlock_authenticate_browsertest_chromeos.js

Merge request because the test CL also includes some fixes for bugs in settings that the tests discovered.

Is this change applicable to any specific OS or all OS?

Just CrOS

Your change meets the bar and is auto-approved for M55 (branch: 2883)

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

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

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

commit eb18f6521660743b0fb77438650897fa8bc8a5e2
Author: Jacob Dufault <jdufault@google.com>
Date: Thu Oct 20 18:33:46 2016

Browser tests for the quick_unlock settings pages.

BUG= 627928 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2157673002
Cr-Commit-Position: refs/heads/master@{#425386}
(cherry picked from commit 12d223ad3993032f0b5339187d1e6beaa86002af)

Review URL: https://codereview.chromium.org/2431093005 .

Cr-Commit-Position: refs/branch-heads/2883@{#217}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/options_resources.grd
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/icons.html
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/people_page/lock_screen.html
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/people_page/lock_state_behavior.js
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/people_page/password_prompt_dialog.js
[delete] https://crrev.com/6896b193ff6b20cd50b8727552c9d850ad39821a/chrome/browser/resources/settings/people_page/quick_unlock_choose_method.js
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/people_page/setup_pin_dialog.html
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/people_page/setup_pin_dialog.js
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/ui/webui/options/options_ui.cc
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/test/data/webui/settings/cr_settings_browsertest.js
[add] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/test/data/webui/settings/fake_quick_unlock_private.js
[add] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/test/data/webui/settings/quick_unlock_authenticate_browsertest_chromeos.js

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

commit eb18f6521660743b0fb77438650897fa8bc8a5e2
Author: Jacob Dufault <jdufault@google.com>
Date: Thu Oct 20 18:33:46 2016

Browser tests for the quick_unlock settings pages.

BUG= 627928 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2157673002
Cr-Commit-Position: refs/heads/master@{#425386}
(cherry picked from commit 12d223ad3993032f0b5339187d1e6beaa86002af)

Review URL: https://codereview.chromium.org/2431093005 .

Cr-Commit-Position: refs/branch-heads/2883@{#217}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/options_resources.grd
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/icons.html
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/people_page/lock_screen.html
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/people_page/lock_state_behavior.js
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/people_page/password_prompt_dialog.js
[delete] https://crrev.com/6896b193ff6b20cd50b8727552c9d850ad39821a/chrome/browser/resources/settings/people_page/quick_unlock_choose_method.js
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/people_page/setup_pin_dialog.html
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/resources/settings/people_page/setup_pin_dialog.js
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/browser/ui/webui/options/options_ui.cc
[modify] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/test/data/webui/settings/cr_settings_browsertest.js
[add] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/test/data/webui/settings/fake_quick_unlock_private.js
[add] https://crrev.com/eb18f6521660743b0fb77438650897fa8bc8a5e2/chrome/test/data/webui/settings/quick_unlock_authenticate_browsertest_chromeos.js

[Automated comment] removing mislabelled merge-merged-2840