[USS] Fix USS in sync_integration_tests in chromeos

[USS] Fix USS in sync_integration_tests in chromeos

Chrome OS will force loading of signin profile, so we need to ignore one more client.
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/chrome_browser_main_chromeos.cc?type=cs&q=ChromeBrowserMainPartsChromeos::PostProfileInit()&l=672

The Tests fixed are
TwoClientUssSyncTest.Error
TwoClientUssSyncTest.Encryption
TwoClientUssSyncTest.Sanity
TwoClientUssSyncTest.ConflictResolution
TwoClientUssSyncTest.DisableEnable
SingleClientSessionsSyncTest.Sanity
SingleClientSessionsSyncTest.NoSessions
SingleClientSessionsSyncTest.ChromeHistory
SingleClientSessionsSyncTest.ResponseCodeIsPreserved
SingleClientSessionsSyncTest.TimestampMatchesHistory

BUG=689662
Review-Url: https://codereview.chromium.org/2694503002
Cr-Commit-Position: refs/heads/master@{#452126}
Committed: https://chromium.googlesource.com/chromium/src/+/e3c16997af716ba961740d9598b6942b70e59ccc

[Gang Wu, 2017-02-11 01:19:15]

The CQ bit was checked by gangwu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-11 01:19:39]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Gang Wu, 2017-02-11 01:21:53]

The CQ bit was checked by gangwu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-11 01:22:02]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Gang Wu, 2017-02-11 01:29:13]

Description was changed from

==========
fix test in chromeos issue

BUG=
==========

to

==========
fix test in chromeos issue

https://cs.chromium.org/chromium/src/chrome/browser/chromeos/chrome_browser_m...

BUG=689662
==========

[commit-bot: I haz the power, 2017-02-11 02:14:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-11 02:14:23]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Gang Wu, 2017-02-14 23:39:41]

The CQ bit was checked by gangwu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-14 23:40:31]

Dry run: 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-02-15 02:20:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-15 02:20:36]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Gang Wu, 2017-02-16 02:09:17]

The CQ bit was checked by gangwu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-16 02:10:11]

Dry run: 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-02-16 03:09:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-16 03:09:34]

Dry run: Try jobs failed on following builders:
  win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[Gang Wu, 2017-02-21 20:23:16]

Patchset #4 (id:60001) has been deleted

[Gang Wu, 2017-02-21 20:23:58]

Patchset #3 (id:40001) has been deleted

[Gang Wu, 2017-02-21 20:27:26]

Patchset #3 (id:80001) has been deleted

[Gang Wu, 2017-02-21 20:33:05]

Description was changed from

==========
fix test in chromeos issue

https://cs.chromium.org/chromium/src/chrome/browser/chromeos/chrome_browser_m...

BUG=689662
==========

to

==========
[USS] Fix USS in sync_integration_tests in chromeos

Chrome OS will force loading of signin profile, so we need to ignore one more
client.
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/chrome_browser_m...

BUG=689662
==========

[Gang Wu, 2017-02-21 20:33:05]

gangwu@chromium.org changed reviewers:
+ skym@chromium.org

[Gang Wu, 2017-02-21 20:34:38]

The CQ bit was checked by gangwu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-21 20:35:33]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Gang Wu, 2017-02-21 22:37:20]

Description was changed from

==========
[USS] Fix USS in sync_integration_tests in chromeos

Chrome OS will force loading of signin profile, so we need to ignore one more
client.
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/chrome_browser_m...

BUG=689662
==========

to

==========
[USS] Fix USS in sync_integration_tests in chromeos

Chrome OS will force loading of signin profile, so we need to ignore one more
client.
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/chrome_browser_m...

The Tests fixed are
TwoClientUssSyncTest.Error
TwoClientUssSyncTest.Encryption
TwoClientUssSyncTest.Sanity
TwoClientUssSyncTest.ConflictResolution
TwoClientUssSyncTest.DisableEnable
SingleClientSessionsSyncTest.Sanity
SingleClientSessionsSyncTest.NoSessions
SingleClientSessionsSyncTest.ChromeHistory
SingleClientSessionsSyncTest.ResponseCodeIsPreserved
SingleClientSessionsSyncTest.TimestampMatchesHistory

BUG=689662
==========

[commit-bot: I haz the power, 2017-02-21 22:39:51]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-21 22:39:52]

Dry run: Try jobs failed on following builders:
  cast_shell_linux on master.tryserver.chromium.linux (JOB_TIMED_OUT, no build
URL)
  chromeos_daisy_chromium_compile_only_ng on master.tryserver.chromium.linux
(JOB_TIMED_OUT, no build URL)
  linux_chromium_asan_rel_ng on master.tryserver.chromium.linux (JOB_TIMED_OUT,
no build URL)
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_TIMED_OUT, no
build URL)

[Gang Wu, 2017-02-21 22:45:05]

PTAL

[skym, 2017-02-21 23:06:54]

lgtm

https://codereview.chromium.org/2694503002/diff/100001/chrome/browser/sync/te...
File chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
(right):

https://codereview.chromium.org/2694503002/diff/100001/chrome/browser/sync/te...
chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc:74: #if
defined(OS_CHROMEOS)
Can you add some comments explaining why we need to do this and what happens if
we do not?

[Patrick Noland, 2017-02-21 23:16:44]

pnoland@chromium.org changed reviewers:
+ pnoland@chromium.org

[Patrick Noland, 2017-02-21 23:16:45]

https://codereview.chromium.org/2694503002/diff/100001/chrome/browser/sync/te...
File chrome/browser/sync/test/integration/two_client_uss_sync_test.cc (right):

https://codereview.chromium.org/2694503002/diff/100001/chrome/browser/sync/te...
chrome/browser/sync/test/integration/two_client_uss_sync_test.cc:205:
number_of_clients_ingnored_ = 1;
[nit] number_of_clients_ignored_

[Gang Wu, 2017-02-22 00:44:32]

The CQ bit was checked by gangwu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-22 00:45:50]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Gang Wu, 2017-02-22 00:50:08]

updated

https://codereview.chromium.org/2694503002/diff/100001/chrome/browser/sync/te...
File chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
(right):

https://codereview.chromium.org/2694503002/diff/100001/chrome/browser/sync/te...
chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc:74: #if
defined(OS_CHROMEOS)
On 2017/02/21 23:06:54, skym wrote:
> Can you add some comments explaining why we need to do this and what happens
if
> we do not?

Done.

I change the way to set. I called base class's SetUpCommandLine to set the
switch.

https://codereview.chromium.org/2694503002/diff/100001/chrome/browser/sync/te...
File chrome/browser/sync/test/integration/two_client_uss_sync_test.cc (right):

https://codereview.chromium.org/2694503002/diff/100001/chrome/browser/sync/te...
chrome/browser/sync/test/integration/two_client_uss_sync_test.cc:205:
number_of_clients_ingnored_ = 1;
On 2017/02/21 23:16:45, Patrick Noland wrote:
> [nit] number_of_clients_ignored_

Done.

[Patrick Noland, 2017-02-22 01:04:43]

https://codereview.chromium.org/2694503002/diff/120001/chrome/browser/sync/te...
File chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
(right):

https://codereview.chromium.org/2694503002/diff/120001/chrome/browser/sync/te...
chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc:74:
SyncTest::SetUpCommandLine(cl);
This will probably make CookieJarMismatch flaky again :( The point of overriding
SetUpCommandLine is to specifically avoid calling SyncTests's implementation
since it triggers the flakiness.

[commit-bot: I haz the power, 2017-02-22 01:40:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-22 01:40:19]

Dry run: Try jobs failed on following builders:
  win_chromium_x64_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)

[Gang Wu, 2017-02-22 04:08:55]

The CQ bit was checked by gangwu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-22 04:09:43]

Dry run: 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-02-22 05:55:27]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-22 05:55:28]

Dry run: This issue passed the CQ dry run.

[Gang Wu, 2017-02-22 06:32:03]

move back to how to set switch

https://codereview.chromium.org/2694503002/diff/120001/chrome/browser/sync/te...
File chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
(right):

https://codereview.chromium.org/2694503002/diff/120001/chrome/browser/sync/te...
chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc:74:
SyncTest::SetUpCommandLine(cl);
On 2017/02/22 01:04:43, Patrick Noland wrote:
> This will probably make CookieJarMismatch flaky again :( The point of
overriding
> SetUpCommandLine is to specifically avoid calling SyncTests's implementation
> since it triggers the flakiness. 

Done.

[skym, 2017-02-22 15:45:41]

still lgtm

https://codereview.chromium.org/2694503002/diff/140001/chrome/browser/sync/te...
File chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
(right):

https://codereview.chromium.org/2694503002/diff/140001/chrome/browser/sync/te...
chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc:74: //
kIgnoreUserProfileMappingForTests will let UserManager always return active
This indentation is wrong now.

https://codereview.chromium.org/2694503002/diff/140001/chrome/browser/sync/te...
chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc:75: //
user. If not set this switch, sync test's profile will not match
If this switch is not set,

[Gang Wu, 2017-02-22 16:01:14]

The CQ bit was checked by gangwu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-22 16:01:47]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Gang Wu, 2017-02-22 16:02:08]

https://codereview.chromium.org/2694503002/diff/140001/chrome/browser/sync/te...
File chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
(right):

https://codereview.chromium.org/2694503002/diff/140001/chrome/browser/sync/te...
chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc:74: //
kIgnoreUserProfileMappingForTests will let UserManager always return active
On 2017/02/22 15:45:40, skym wrote:
> This indentation is wrong now.

Done.

https://codereview.chromium.org/2694503002/diff/140001/chrome/browser/sync/te...
chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc:75: //
user. If not set this switch, sync test's profile will not match
On 2017/02/22 15:45:40, skym wrote:
> If this switch is not set,

Done.

[commit-bot: I haz the power, 2017-02-22 16:34:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-22 16:34:58]

Dry run: This issue passed the CQ dry run.

[Gang Wu, 2017-02-22 18:00:32]

The CQ bit was checked by gangwu@chromium.org

[Gang Wu, 2017-02-22 18:00:32]

The patchset sent to the CQ was uploaded after l-g-t-m from skym@chromium.org
Link to the patchset: https://codereview.chromium.org/2694503002/#ps160001
(title: "modified comments")

[commit-bot: I haz the power, 2017-02-22 18:01:26]

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-02-22 18:08:09]

CQ is committing da patch.

Bot data: {"patchset_id": 160001, "attempt_start_ts": 1487786432604940,
"parent_rev": "5d04cccc168b54e6d05f7e9efbb180d87583b30b", "commit_rev":
"e3c16997af716ba961740d9598b6942b70e59ccc"}

[commit-bot: I haz the power, 2017-02-22 18:08:47]

Description was changed from

==========
[USS] Fix USS in sync_integration_tests in chromeos

Chrome OS will force loading of signin profile, so we need to ignore one more
client.
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/chrome_browser_m...

The Tests fixed are
TwoClientUssSyncTest.Error
TwoClientUssSyncTest.Encryption
TwoClientUssSyncTest.Sanity
TwoClientUssSyncTest.ConflictResolution
TwoClientUssSyncTest.DisableEnable
SingleClientSessionsSyncTest.Sanity
SingleClientSessionsSyncTest.NoSessions
SingleClientSessionsSyncTest.ChromeHistory
SingleClientSessionsSyncTest.ResponseCodeIsPreserved
SingleClientSessionsSyncTest.TimestampMatchesHistory

BUG=689662
==========

to

==========
[USS] Fix USS in sync_integration_tests in chromeos

Chrome OS will force loading of signin profile, so we need to ignore one more
client.
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/chrome_browser_m...

The Tests fixed are
TwoClientUssSyncTest.Error
TwoClientUssSyncTest.Encryption
TwoClientUssSyncTest.Sanity
TwoClientUssSyncTest.ConflictResolution
TwoClientUssSyncTest.DisableEnable
SingleClientSessionsSyncTest.Sanity
SingleClientSessionsSyncTest.NoSessions
SingleClientSessionsSyncTest.ChromeHistory
SingleClientSessionsSyncTest.ResponseCodeIsPreserved
SingleClientSessionsSyncTest.TimestampMatchesHistory

BUG=689662

Review-Url: https://codereview.chromium.org/2694503002
Cr-Commit-Position: refs/heads/master@{#452126}
Committed:
https://chromium.googlesource.com/chromium/src/+/e3c16997af716ba961740d9598b6...
==========

[commit-bot: I haz the power, 2017-02-22 18:08:49]

Committed patchset #6 (id:160001) as
https://chromium.googlesource.com/chromium/src/+/e3c16997af716ba961740d9598b6...