| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 syncer::STORAGE_IN_MEMORY); | 430 syncer::STORAGE_IN_MEMORY); |
| 431 | 431 |
| 432 // The backend is not ready. Ensure the PSS knows this. | 432 // The backend is not ready. Ensure the PSS knows this. |
| 433 EXPECT_FALSE(harness_.service->sync_initialized()); | 433 EXPECT_FALSE(harness_.service->sync_initialized()); |
| 434 } | 434 } |
| 435 | 435 |
| 436 // Register a handler with the ProfileSyncService, and disable and | 436 // Register a handler with the ProfileSyncService, and disable and |
| 437 // reenable sync. The handler should get notified of the state | 437 // reenable sync. The handler should get notified of the state |
| 438 // changes. | 438 // changes. |
| 439 // Flaky on all platforms. http://crbug.com/154491 | 439 // Flaky on all platforms. http://crbug.com/154491 |
| 440 TEST_F(ProfileSyncServiceTest, FLAKY_DisableInvalidationsOnStop) { | 440 TEST_F(ProfileSyncServiceTest, DISABLED_DisableInvalidationsOnStop) { |
| 441 harness_.StartSyncServiceAndSetInitialSyncEnded( | 441 harness_.StartSyncServiceAndSetInitialSyncEnded( |
| 442 true, true, true, true, syncer::STORAGE_IN_MEMORY); | 442 true, true, true, true, syncer::STORAGE_IN_MEMORY); |
| 443 | 443 |
| 444 syncer::FakeInvalidationHandler handler; | 444 syncer::FakeInvalidationHandler handler; |
| 445 harness_.service->RegisterInvalidationHandler(&handler); | 445 harness_.service->RegisterInvalidationHandler(&handler); |
| 446 | 446 |
| 447 SyncBackendHostForProfileSyncTest* const backend = | 447 SyncBackendHostForProfileSyncTest* const backend = |
| 448 harness_.service->GetBackendForTest(); | 448 harness_.service->GetBackendForTest(); |
| 449 | 449 |
| 450 backend->EmitOnInvalidatorStateChange(syncer::INVALIDATIONS_ENABLED); | 450 backend->EmitOnInvalidatorStateChange(syncer::INVALIDATIONS_ENABLED); |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 609 namespace syncer { | 609 namespace syncer { |
| 610 namespace { | 610 namespace { |
| 611 | 611 |
| 612 // ProfileSyncService should behave just like an invalidator. | 612 // ProfileSyncService should behave just like an invalidator. |
| 613 INSTANTIATE_TYPED_TEST_CASE_P( | 613 INSTANTIATE_TYPED_TEST_CASE_P( |
| 614 ProfileSyncServiceInvalidatorTest, InvalidatorTest, | 614 ProfileSyncServiceInvalidatorTest, InvalidatorTest, |
| 615 ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate); | 615 ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate); |
| 616 | 616 |
| 617 } // namespace | 617 } // namespace |
| 618 } // namespace syncer | 618 } // namespace syncer |
| OLD | NEW |