Enforces order for settings reset

Enforces order for settings reset

This fixes a weird interaction between to tasks involving settings reset:
 - Post-cleanup settings reset, which can happen at start up after the
   Chrome Cleanup Tool successfully completed (for example, it may have
   required a reboot);
 - Settings reset prompt, which will check if user settings have been
   hijacked and offer the user to reset it to its default values.

In case both features are enabled, we should only check the latter after
completing the former, so that we will not prompt users to reset their
settings if they have already agreed on resetting them post-cleanup.

BUG=690020
Review-Url: https://codereview.chromium.org/2971183002
Cr-Commit-Position: refs/heads/master@{#485274}
Committed: https://chromium.googlesource.com/chromium/src/+/52ad47d6764c9dbacb4f5e45704db3edae3b8629

[ftirelo, 2017-07-06 16:58:22]

ftirelo@chromium.org changed reviewers:
+ csharp@chromium.org

[csharp, 2017-07-06 17:09:02]

lgtm

https://codereview.chromium.org/2971183002/diff/1/chrome/browser/chrome_brows...
File chrome/browser/chrome_browser_main_win.cc (right):

https://codereview.chromium.org/2971183002/diff/1/chrome/browser/chrome_brows...
chrome/browser/chrome_browser_main_win.cc:234: // Posts the settings reset
prompt to be shown after startup if feature
nit: I'm not sure if this comment adds much, since the code basically says the
same thing.

[ftirelo, 2017-07-06 17:30:18]

ftirelo@chromium.org changed reviewers:
+ jochen@chromium.org

[ftirelo, 2017-07-06 17:30:38]

+jochen for OWNERS of chrome_browser_main_win.cc

[jochen (gone - plz use gerrit), 2017-07-07 07:46:11]

is it possible to write a test for this?

[ftirelo, 2017-07-07 17:41:37]

Added browser test to check that settings reset prompt is always checked. PTAL

On 2017/07/07 07:46:11, jochen wrote:
> is it possible to write a test for this?

Done.

[jochen (gone - plz use gerrit), 2017-07-10 06:49:34]

lgtm

[ftirelo, 2017-07-10 13:10:53]

The CQ bit was checked by ftirelo@chromium.org

[ftirelo, 2017-07-10 13:10:54]

The patchset sent to the CQ was uploaded after l-g-t-m from csharp@chromium.org
Link to the patchset: https://codereview.chromium.org/2971183002/#ps40001
(title: "Add browser test for dependency")

[commit-bot: I haz the power, 2017-07-10 13:11:00]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-07-10 15:36:50]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1499692253840980,
"parent_rev": "90162167a88189539d396612b06bb9cf09b1e8be", "commit_rev":
"9f3a86df7ce5295fa005758765d8716763cd86e6"}

[commit-bot: I haz the power, 2017-07-10 15:37:04]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1499692253840980,
"parent_rev": "c40f3141819e893436c93b276d3d14abf0f28f19", "commit_rev":
"52ad47d6764c9dbacb4f5e45704db3edae3b8629"}

[commit-bot: I haz the power, 2017-07-10 15:37:18]

Description was changed from

==========
Enforces order for settings reset

This fixes a weird interaction between to tasks involving settings reset:
 - Post-cleanup settings reset, which can happen at start up after the
   Chrome Cleanup Tool successfully completed (for example, it may have
   required a reboot);
 - Settings reset prompt, which will check if user settings have been
   hijacked and offer the user to reset it to its default values.

In case both features are enabled, we should only check the latter after
completing the former, so that we will not prompt users to reset their
settings if they have already agreed on resetting them post-cleanup.

BUG=690020
==========

to

==========
Enforces order for settings reset

This fixes a weird interaction between to tasks involving settings reset:
 - Post-cleanup settings reset, which can happen at start up after the
   Chrome Cleanup Tool successfully completed (for example, it may have
   required a reboot);
 - Settings reset prompt, which will check if user settings have been
   hijacked and offer the user to reset it to its default values.

In case both features are enabled, we should only check the latter after
completing the former, so that we will not prompt users to reset their
settings if they have already agreed on resetting them post-cleanup.

BUG=690020

Review-Url: https://codereview.chromium.org/2971183002
Cr-Commit-Position: refs/heads/master@{#485274}
Committed:
https://chromium.googlesource.com/chromium/src/+/52ad47d6764c9dbacb4f5e45704d...
==========

[commit-bot: I haz the power, 2017-07-10 15:37:19]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/chromium/src/+/52ad47d6764c9dbacb4f5e45704d...