Update TestExpectations.
Update TestExpectations.

- Resolve conflicts
- Correct entries for terminate-during-sync-operation-*.html

BUG=
TBR=jshin@chromium.org

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

git-svn-id: bf5cd6ccde378db821296732a091cfbcf5285fbd@175443 bbb929c8-8fbe-4397-9dbb-9b2b20218538

primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs