[Sync] Stop updating local device info time stamp on merge.

[Sync] Stop updating local device info time stamp on merge.

When merging, if we're given specifics that correspond to the local
guid, we try to access specifics object for the local guid in
|all_data_|. The problem with this, is that there isn't always an entry
there if reconcile has not happened yet. This only happens when the
initial sync round trip finishes before metadata loads from disk, but
this race is happening to users, see the bug.

The fix could be to check that |all_data_| actually contains an entry
for the local guid, but it really doesn't matter. Local data completely
cleared when sync is disabled, so reconcile will always create a local
entry with a fresh time stamp around the time merge is called. There's
no reason to complicate the logic inside of merge for no real benefit,
so I've simply removed the set_last_updated_timestamp call.

BUG=668938
Committed: https://crrev.com/459c7c57ffcae234ad209b63035e2f6fede1e975
Cr-Commit-Position: refs/heads/master@{#435011}

[skym, 2016-11-29 00:23:12]

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

[commit-bot: I haz the power, 2016-11-29 00:24:22]

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

[skym, 2016-11-29 00:48:23]

Description was changed from

==========
[Sync] Stop updating local device info timestamp on merge.

BUG=668938
==========

to

==========
[Sync] Stop updating local device info time stamp on merge.

When merging, if we're given specifics that correspond to the local
guid, we try to access specifics object for the local guid in
|all_data_|. The problem with this, is that there isn't always an entry
there if reconcile has not happened yet. This only happens when the
initial sync round trip finishes before metadata loads from disk, but
this race is happening to users, see the bug.

The fix could be to check that |all_data_| actually contains an entry
for the local guid, but it really doesn't matter. Local data completely
cleared when sync is disabled, so reconcile will always create a local
entry with a fresh time stamp around the time merge is called. There's
no reason to complicate the logic inside of merge for no real benefit,
so I've simply removed the set_last_updated_timestamp call.

BUG=668938
==========

[skym, 2016-11-29 00:48:23]

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

[skym, 2016-11-29 00:48:29]

PTAL

[maxbogue, 2016-11-29 01:19:37]

lgtm

[commit-bot: I haz the power, 2016-11-29 02:09:32]

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

[commit-bot: I haz the power, 2016-11-29 02:09:32]

Dry run: This issue passed the CQ dry run.

[skym, 2016-11-29 16:32:12]

The CQ bit was checked by skym@chromium.org

[commit-bot: I haz the power, 2016-11-29 16:32:25]

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, 2016-11-29 16:36:07]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1480437132470500, "parent_rev":
"37bafb423179be29d16ea18d9574a46040d1c5f9", "commit_rev":
"e6eeffb5a99ca1a0fc3d9834aa4d2950f12eeeeb"}

[commit-bot: I haz the power, 2016-11-29 16:36:37]

Description was changed from

==========
[Sync] Stop updating local device info time stamp on merge.

When merging, if we're given specifics that correspond to the local
guid, we try to access specifics object for the local guid in
|all_data_|. The problem with this, is that there isn't always an entry
there if reconcile has not happened yet. This only happens when the
initial sync round trip finishes before metadata loads from disk, but
this race is happening to users, see the bug.

The fix could be to check that |all_data_| actually contains an entry
for the local guid, but it really doesn't matter. Local data completely
cleared when sync is disabled, so reconcile will always create a local
entry with a fresh time stamp around the time merge is called. There's
no reason to complicate the logic inside of merge for no real benefit,
so I've simply removed the set_last_updated_timestamp call.

BUG=668938
==========

to

==========
[Sync] Stop updating local device info time stamp on merge.

When merging, if we're given specifics that correspond to the local
guid, we try to access specifics object for the local guid in
|all_data_|. The problem with this, is that there isn't always an entry
there if reconcile has not happened yet. This only happens when the
initial sync round trip finishes before metadata loads from disk, but
this race is happening to users, see the bug.

The fix could be to check that |all_data_| actually contains an entry
for the local guid, but it really doesn't matter. Local data completely
cleared when sync is disabled, so reconcile will always create a local
entry with a fresh time stamp around the time merge is called. There's
no reason to complicate the logic inside of merge for no real benefit,
so I've simply removed the set_last_updated_timestamp call.

BUG=668938
==========

[commit-bot: I haz the power, 2016-11-29 16:36:39]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-11-29 16:40:23]

Description was changed from

==========
[Sync] Stop updating local device info time stamp on merge.

When merging, if we're given specifics that correspond to the local
guid, we try to access specifics object for the local guid in
|all_data_|. The problem with this, is that there isn't always an entry
there if reconcile has not happened yet. This only happens when the
initial sync round trip finishes before metadata loads from disk, but
this race is happening to users, see the bug.

The fix could be to check that |all_data_| actually contains an entry
for the local guid, but it really doesn't matter. Local data completely
cleared when sync is disabled, so reconcile will always create a local
entry with a fresh time stamp around the time merge is called. There's
no reason to complicate the logic inside of merge for no real benefit,
so I've simply removed the set_last_updated_timestamp call.

BUG=668938
==========

to

==========
[Sync] Stop updating local device info time stamp on merge.

When merging, if we're given specifics that correspond to the local
guid, we try to access specifics object for the local guid in
|all_data_|. The problem with this, is that there isn't always an entry
there if reconcile has not happened yet. This only happens when the
initial sync round trip finishes before metadata loads from disk, but
this race is happening to users, see the bug.

The fix could be to check that |all_data_| actually contains an entry
for the local guid, but it really doesn't matter. Local data completely
cleared when sync is disabled, so reconcile will always create a local
entry with a fresh time stamp around the time merge is called. There's
no reason to complicate the logic inside of merge for no real benefit,
so I've simply removed the set_last_updated_timestamp call.

BUG=668938

Committed: https://crrev.com/459c7c57ffcae234ad209b63035e2f6fede1e975
Cr-Commit-Position: refs/heads/master@{#435011}
==========

[commit-bot: I haz the power, 2016-11-29 16:40:24]

Patchset 1 (id:??) landed as
https://crrev.com/459c7c57ffcae234ad209b63035e2f6fede1e975
Cr-Commit-Position: refs/heads/master@{#435011}