| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <list> | 5 #include <list> |
| 6 #include <map> | 6 #include <map> |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/scoped_ptr.h" | 9 #include "base/scoped_ptr.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| (...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 742 HttpResponse::SERVER_CONNECTION_OK, | 742 HttpResponse::SERVER_CONNECTION_OK, |
| 743 true}; | 743 true}; |
| 744 connection()->channel()->NotifyListeners(e); | 744 connection()->channel()->NotifyListeners(e); |
| 745 | 745 |
| 746 interceptor.WaitForSyncShare(1, TimeDelta::FromSeconds(10)); | 746 interceptor.WaitForSyncShare(1, TimeDelta::FromSeconds(10)); |
| 747 EXPECT_FALSE(interceptor.times_sync_occured().empty()); | 747 EXPECT_FALSE(interceptor.times_sync_occured().empty()); |
| 748 | 748 |
| 749 EXPECT_TRUE(syncer_thread()->Stop(2000)); | 749 EXPECT_TRUE(syncer_thread()->Stop(2000)); |
| 750 } | 750 } |
| 751 | 751 |
| 752 TEST_F(SyncerThreadWithSyncerTest, Pause) { | 752 // Timesout http:://crbug.com/39070 |
| 753 TEST_F(SyncerThreadWithSyncerTest, DISABLED_Pause) { |
| 753 WaitableEvent sync_cycle_ended_event(false, false); | 754 WaitableEvent sync_cycle_ended_event(false, false); |
| 754 WaitableEvent paused_event(false, false); | 755 WaitableEvent paused_event(false, false); |
| 755 WaitableEvent resumed_event(false, false); | 756 WaitableEvent resumed_event(false, false); |
| 756 PreventThreadFromPolling(); | 757 PreventThreadFromPolling(); |
| 757 | 758 |
| 758 ListenerMock listener; | 759 ListenerMock listener; |
| 759 scoped_ptr<ChannelHookup<SyncerEvent> > hookup; | 760 scoped_ptr<ChannelHookup<SyncerEvent> > hookup; |
| 760 hookup.reset(syncer_thread()->relay_channel()->AddObserver(&listener)); | 761 hookup.reset(syncer_thread()->relay_channel()->AddObserver(&listener)); |
| 761 | 762 |
| 762 EXPECT_CALL(listener, HandleChannelEvent( | 763 EXPECT_CALL(listener, HandleChannelEvent( |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 935 EXPECT_CALL(listener, HandleChannelEvent( | 936 EXPECT_CALL(listener, HandleChannelEvent( |
| 936 Field(&SyncerEvent::what_happened, SyncerEvent::SYNC_CYCLE_ENDED))). | 937 Field(&SyncerEvent::what_happened, SyncerEvent::SYNC_CYCLE_ENDED))). |
| 937 WillOnce(SignalEvent(&sync_cycle_ended_event)); | 938 WillOnce(SignalEvent(&sync_cycle_ended_event)); |
| 938 ASSERT_TRUE(Resume(&listener)); | 939 ASSERT_TRUE(Resume(&listener)); |
| 939 sync_cycle_ended_event.Wait(); | 940 sync_cycle_ended_event.Wait(); |
| 940 | 941 |
| 941 EXPECT_TRUE(syncer_thread()->Stop(2000)); | 942 EXPECT_TRUE(syncer_thread()->Stop(2000)); |
| 942 } | 943 } |
| 943 | 944 |
| 944 } // namespace browser_sync | 945 } // namespace browser_sync |
| OLD | NEW |