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

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

Issue 116533006: Control invalidations network channel from TiclInvalidationService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 11 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
« no previous file with comments | « sync/notifier/invalidation_notifier.cc ('k') | sync/notifier/non_blocking_invalidator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/invalidation_notifier.h" 5 #include "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/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "jingle/notifier/base/fake_base_task.h" 9 #include "jingle/notifier/base/fake_base_task.h"
10 #include "jingle/notifier/base/notifier_options.h" 10 #include "jingle/notifier/base/notifier_options.h"
11 #include "jingle/notifier/listener/fake_push_client.h" 11 #include "jingle/notifier/listener/fake_push_client.h"
12 #include "net/url_request/url_request_test_util.h" 12 #include "net/url_request/url_request_test_util.h"
13 #include "sync/internal_api/public/base/model_type.h" 13 #include "sync/internal_api/public/base/model_type.h"
14 #include "sync/internal_api/public/util/weak_handle.h" 14 #include "sync/internal_api/public/util/weak_handle.h"
15 #include "sync/notifier/fake_invalidation_handler.h" 15 #include "sync/notifier/fake_invalidation_handler.h"
16 #include "sync/notifier/fake_invalidation_state_tracker.h" 16 #include "sync/notifier/fake_invalidation_state_tracker.h"
17 #include "sync/notifier/invalidation_state_tracker.h" 17 #include "sync/notifier/invalidation_state_tracker.h"
18 #include "sync/notifier/invalidator_test_template.h" 18 #include "sync/notifier/invalidator_test_template.h"
19 #include "sync/notifier/push_client_channel.h"
19 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
20 21
21 namespace syncer { 22 namespace syncer {
22 23
23 namespace { 24 namespace {
24 25
25 class InvalidationNotifierTestDelegate { 26 class InvalidationNotifierTestDelegate {
26 public: 27 public:
27 InvalidationNotifierTestDelegate() {} 28 InvalidationNotifierTestDelegate() {}
28 29
29 ~InvalidationNotifierTestDelegate() { 30 ~InvalidationNotifierTestDelegate() {
30 DestroyInvalidator(); 31 DestroyInvalidator();
31 } 32 }
32 33
33 void CreateInvalidator( 34 void CreateInvalidator(
34 const std::string& invalidator_client_id, 35 const std::string& invalidator_client_id,
35 const std::string& initial_state, 36 const std::string& initial_state,
36 const base::WeakPtr<InvalidationStateTracker>& 37 const base::WeakPtr<InvalidationStateTracker>&
37 invalidation_state_tracker) { 38 invalidation_state_tracker) {
38 DCHECK(!invalidator_.get()); 39 DCHECK(!invalidator_.get());
40 scoped_ptr<notifier::PushClient> push_client(
41 new notifier::FakePushClient());
42 scoped_ptr<SyncNetworkChannel> network_channel(
43 new PushClientChannel(push_client.Pass()));
39 invalidator_.reset( 44 invalidator_.reset(
40 new InvalidationNotifier( 45 new InvalidationNotifier(
41 scoped_ptr<notifier::PushClient>(new notifier::FakePushClient()), 46 network_channel.Pass(),
42 invalidator_client_id, 47 invalidator_client_id,
43 UnackedInvalidationsMap(), 48 UnackedInvalidationsMap(),
44 initial_state, 49 initial_state,
45 MakeWeakHandle(invalidation_state_tracker), 50 MakeWeakHandle(invalidation_state_tracker),
46 "fake_client_info")); 51 "fake_client_info"));
47 } 52 }
48 53
49 Invalidator* GetInvalidator() { 54 Invalidator* GetInvalidator() {
50 return invalidator_.get(); 55 return invalidator_.get();
51 } 56 }
(...skipping 26 matching lines...) Expand all
78 scoped_ptr<InvalidationNotifier> invalidator_; 83 scoped_ptr<InvalidationNotifier> invalidator_;
79 }; 84 };
80 85
81 INSTANTIATE_TYPED_TEST_CASE_P( 86 INSTANTIATE_TYPED_TEST_CASE_P(
82 InvalidationNotifierTest, InvalidatorTest, 87 InvalidationNotifierTest, InvalidatorTest,
83 InvalidationNotifierTestDelegate); 88 InvalidationNotifierTestDelegate);
84 89
85 } // namespace 90 } // namespace
86 91
87 } // namespace syncer 92 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/notifier/invalidation_notifier.cc ('k') | sync/notifier/non_blocking_invalidator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698