OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/sync/notifier/invalidation_notifier.h" | 5 #include "chrome/browser/sync/notifier/invalidation_notifier.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h" | 9 #include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h" |
10 #include "chrome/browser/sync/syncable/model_type.h" | 10 #include "chrome/browser/sync/syncable/model_type.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 notifier_options.request_context_getter = | 36 notifier_options.request_context_getter = |
37 new TestURLRequestContextGetter(); | 37 new TestURLRequestContextGetter(); |
38 invalidation_notifier_.reset(new InvalidationNotifier(notifier_options, | 38 invalidation_notifier_.reset(new InvalidationNotifier(notifier_options, |
39 "fake_client_info")); | 39 "fake_client_info")); |
40 invalidation_notifier_->AddObserver(&mock_observer_); | 40 invalidation_notifier_->AddObserver(&mock_observer_); |
41 } | 41 } |
42 | 42 |
43 virtual void TearDown() { | 43 virtual void TearDown() { |
44 invalidation_notifier_->RemoveObserver(&mock_observer_); | 44 invalidation_notifier_->RemoveObserver(&mock_observer_); |
45 invalidation_notifier_.reset(); | 45 invalidation_notifier_.reset(); |
| 46 message_loop_.RunAllPending(); |
46 } | 47 } |
47 | 48 |
48 MessageLoop message_loop_; | 49 MessageLoop message_loop_; |
49 scoped_ptr<InvalidationNotifier> invalidation_notifier_; | 50 scoped_ptr<InvalidationNotifier> invalidation_notifier_; |
50 StrictMock<MockSyncNotifierObserver> mock_observer_; | 51 StrictMock<MockSyncNotifierObserver> mock_observer_; |
51 notifier::FakeBaseTask fake_base_task_; | 52 notifier::FakeBaseTask fake_base_task_; |
52 // Since this test calls HostResolver code, we need an IO thread. | 53 // Since this test calls HostResolver code, we need an IO thread. |
53 BrowserThread io_thread_; | 54 BrowserThread io_thread_; |
54 }; | 55 }; |
55 | 56 |
(...skipping 23 matching lines...) Expand all Loading... |
79 // Shouldn't trigger notification state change. | 80 // Shouldn't trigger notification state change. |
80 invalidation_notifier_->OnDisconnect(); | 81 invalidation_notifier_->OnDisconnect(); |
81 invalidation_notifier_->OnConnect(fake_base_task_.AsWeakPtr()); | 82 invalidation_notifier_->OnConnect(fake_base_task_.AsWeakPtr()); |
82 | 83 |
83 invalidation_notifier_->OnSessionStatusChanged(false); | 84 invalidation_notifier_->OnSessionStatusChanged(false); |
84 } | 85 } |
85 | 86 |
86 } // namespace | 87 } // namespace |
87 | 88 |
88 } // namespace sync_notifier | 89 } // namespace sync_notifier |
OLD | NEW |