OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/sessions/sync_session.h" | 5 #include "sync/sessions/sync_session.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 NULL, | 59 NULL, |
60 NULL, | 60 NULL, |
61 workers, | 61 workers, |
62 extensions_activity_.get(), | 62 extensions_activity_.get(), |
63 std::vector<SyncEngineEventListener*>(), | 63 std::vector<SyncEngineEventListener*>(), |
64 NULL, | 64 NULL, |
65 NULL, | 65 NULL, |
66 true, // enable keystore encryption | 66 true, // enable keystore encryption |
67 false, // force enable pre-commit GU avoidance experiment | 67 false, // force enable pre-commit GU avoidance experiment |
68 "fake_invalidator_client_id")); | 68 "fake_invalidator_client_id")); |
69 context_->set_routing_info(routes_); | 69 context_->SetRoutingInfo(routes_); |
70 | 70 |
71 session_.reset(MakeSession()); | 71 session_.reset(MakeSession()); |
72 } | 72 } |
73 virtual void TearDown() { | 73 virtual void TearDown() { |
74 session_.reset(); | 74 session_.reset(); |
75 context_.reset(); | 75 context_.reset(); |
76 } | 76 } |
77 | 77 |
78 virtual void OnThrottled(const base::TimeDelta& throttle_duration) OVERRIDE { | 78 virtual void OnThrottled(const base::TimeDelta& throttle_duration) OVERRIDE { |
79 FailControllerInvocationIfDisabled("OnThrottled"); | 79 FailControllerInvocationIfDisabled("OnThrottled"); |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 scoped_ptr<SyncSession> session_; | 141 scoped_ptr<SyncSession> session_; |
142 scoped_ptr<SyncSessionContext> context_; | 142 scoped_ptr<SyncSessionContext> context_; |
143 std::vector<scoped_refptr<ModelSafeWorker> > workers_; | 143 std::vector<scoped_refptr<ModelSafeWorker> > workers_; |
144 ModelSafeRoutingInfo routes_; | 144 ModelSafeRoutingInfo routes_; |
145 scoped_refptr<ExtensionsActivity> extensions_activity_; | 145 scoped_refptr<ExtensionsActivity> extensions_activity_; |
146 }; | 146 }; |
147 | 147 |
148 } // namespace | 148 } // namespace |
149 } // namespace sessions | 149 } // namespace sessions |
150 } // namespace syncer | 150 } // namespace syncer |
OLD | NEW |