Reland r81454 (sync non-frontend datatype controllers) with longer timeouts.

Original codereview: http://codereview.chromium.org/6811003

BUG=77964
TEST=unit

Review URL: http://codereview.chromium.org/6869016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82028 0039d316-1c4b-4281-b951-d872f2087c98
31 files changed