GitLab

Relaxed some integrations tests that failed because of this.  A client
with type X disabled shouldn't be expected to quiesce with other clients
that with X enabled given a change to X.

Cleaned up indentation in preferences integration test.

BUG=138893
TEST=


Review URL: https://chromiumcodereview.appspot.com/10833004

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