GitLab

This CL is the followup fix for CL/569538/ which was reverted because it
caused timeouts of egtests.  This CL made some change on a egtest to
prevent the timeout. Other than that, this CL is identical to CL/569538.

[Patch set 1] is identical to CL/569538.
[Patch set 2] added the fix to prevent egtest timeout.

[Demo videos]
- account with bookmarks:
https://drive.google.com/open?id=0B1O0Z7eoZMuGeTBjVXdla0RPeFE
- account with no bookmarks:
https://drive.google.com/open?id=0B1O0Z7eoZMuGR0pGb2tYUHcyOWM

TEST=Make sure it works when signed in user has no bookmarks or there is any sync error...

Bug: 696893
Change-Id: I92af0f4a1c9f88f6595f8a851ff92f0b5215132b
Reviewed-on: https://chromium-review.googlesource.com/587517
Commit-Queue: Marti Wong <martiw@chromium.org>
Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Jean-François Geyelin <jif@chromium.org>
Reviewed-by: Eric Noyau <noyau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491181}