| Index: chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc
|
| diff --git a/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc
|
| index f2997c2d4cf3e33f4c4739962a9ff6fa4f8b0c9a..c1c5f6f87f9e4c28580c441693a806e6432416a9 100644
|
| --- a/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc
|
| +++ b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc
|
| @@ -21,13 +21,15 @@ class MultipleClientPasswordsSyncTest : public SyncTest {
|
| MultipleClientPasswordsSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
|
| virtual ~MultipleClientPasswordsSyncTest() {}
|
|
|
| + virtual bool TestUsesSelfNotifications() OVERRIDE {
|
| + return false;
|
| + }
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(MultipleClientPasswordsSyncTest);
|
| };
|
|
|
| -// This test was flaky on the Mac buildbot and also appears to be flaky
|
| -// in local Linux (debug) builds. See crbug.com/363247.
|
| -IN_PROC_BROWSER_TEST_F(MultipleClientPasswordsSyncTest, DISABLED_Sanity) {
|
| +IN_PROC_BROWSER_TEST_F(MultipleClientPasswordsSyncTest, Sanity) {
|
| ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
|
|
|
| for (int i = 0; i < num_clients(); ++i) {
|
|
|