Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Side by Side Diff: sync/notifier/non_blocking_invalidation_notifier_unittest.cc

Issue 10407014: Rename InvalidationVersionTracker to InvalidationStateTracker in preparation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "sync/notifier/non_blocking_invalidation_notifier.h" 5 #include "sync/notifier/non_blocking_invalidation_notifier.h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.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/threading/thread.h" 10 #include "base/threading/thread.h"
11 #include "jingle/notifier/base/fake_base_task.h" 11 #include "jingle/notifier/base/fake_base_task.h"
12 #include "net/url_request/url_request_test_util.h" 12 #include "net/url_request/url_request_test_util.h"
13 #include "sync/notifier/invalidation_version_tracker.h" 13 #include "sync/notifier/invalidation_state_tracker.h"
14 #include "sync/notifier/mock_sync_notifier_observer.h" 14 #include "sync/notifier/mock_sync_notifier_observer.h"
15 #include "sync/syncable/model_type.h" 15 #include "sync/syncable/model_type.h"
16 #include "sync/syncable/model_type_payload_map.h" 16 #include "sync/syncable/model_type_payload_map.h"
17 #include "sync/util/weak_handle.h" 17 #include "sync/util/weak_handle.h"
18 #include "testing/gmock/include/gmock/gmock.h" 18 #include "testing/gmock/include/gmock/gmock.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 20
21 namespace sync_notifier { 21 namespace sync_notifier {
22 22
23 namespace { 23 namespace {
(...skipping 12 matching lines...) Expand all
36 io_thread_.StartWithOptions(options); 36 io_thread_.StartWithOptions(options);
37 request_context_getter_ = 37 request_context_getter_ =
38 new TestURLRequestContextGetter(io_thread_.message_loop_proxy()); 38 new TestURLRequestContextGetter(io_thread_.message_loop_proxy());
39 notifier::NotifierOptions notifier_options; 39 notifier::NotifierOptions notifier_options;
40 notifier_options.request_context_getter = request_context_getter_; 40 notifier_options.request_context_getter = request_context_getter_;
41 invalidation_notifier_.reset( 41 invalidation_notifier_.reset(
42 new NonBlockingInvalidationNotifier( 42 new NonBlockingInvalidationNotifier(
43 notifier_options, 43 notifier_options,
44 InvalidationVersionMap(), 44 InvalidationVersionMap(),
45 browser_sync::MakeWeakHandle( 45 browser_sync::MakeWeakHandle(
46 base::WeakPtr<sync_notifier::InvalidationVersionTracker>()), 46 base::WeakPtr<sync_notifier::InvalidationStateTracker>()),
47 "fake_client_info")); 47 "fake_client_info"));
48 invalidation_notifier_->AddObserver(&mock_observer_); 48 invalidation_notifier_->AddObserver(&mock_observer_);
49 } 49 }
50 50
51 virtual void TearDown() { 51 virtual void TearDown() {
52 invalidation_notifier_->RemoveObserver(&mock_observer_); 52 invalidation_notifier_->RemoveObserver(&mock_observer_);
53 invalidation_notifier_.reset(); 53 invalidation_notifier_.reset();
54 request_context_getter_ = NULL; 54 request_context_getter_ = NULL;
55 io_thread_.Stop(); 55 io_thread_.Stop();
56 ui_loop_.RunAllPending(); 56 ui_loop_.RunAllPending();
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 invalidation_notifier_->OnIncomingNotification(type_payloads, 88 invalidation_notifier_->OnIncomingNotification(type_payloads,
89 REMOTE_NOTIFICATION); 89 REMOTE_NOTIFICATION);
90 invalidation_notifier_->OnNotificationStateChange(false); 90 invalidation_notifier_->OnNotificationStateChange(false);
91 91
92 ui_loop_.RunAllPending(); 92 ui_loop_.RunAllPending();
93 } 93 }
94 94
95 } // namespace 95 } // namespace
96 96
97 } // namespace sync_notifier 97 } // namespace sync_notifier
OLDNEW
« no previous file with comments | « sync/notifier/non_blocking_invalidation_notifier.cc ('k') | sync/notifier/sync_notifier_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698