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.h" | 10 #include "base/message_loop.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 context_.reset( | 57 context_.reset( |
58 new SyncSessionContext( | 58 new SyncSessionContext( |
59 NULL, | 59 NULL, |
60 NULL, | 60 NULL, |
61 workers, | 61 workers, |
62 &extensions_activity_monitor_, | 62 &extensions_activity_monitor_, |
63 throttled_data_type_tracker_.get(), | 63 throttled_data_type_tracker_.get(), |
64 std::vector<SyncEngineEventListener*>(), | 64 std::vector<SyncEngineEventListener*>(), |
65 NULL, | 65 NULL, |
66 NULL, | 66 NULL, |
67 true /* enable keystore encryption */)); | 67 true, // enable keystore encryption |
| 68 "fake_invalidator_client_id")); |
68 context_->set_routing_info(routes_); | 69 context_->set_routing_info(routes_); |
69 | 70 |
70 session_.reset(MakeSession()); | 71 session_.reset(MakeSession()); |
71 throttled_data_type_tracker_.reset(new ThrottledDataTypeTracker(NULL)); | 72 throttled_data_type_tracker_.reset(new ThrottledDataTypeTracker(NULL)); |
72 } | 73 } |
73 virtual void TearDown() { | 74 virtual void TearDown() { |
74 session_.reset(); | 75 session_.reset(); |
75 context_.reset(); | 76 context_.reset(); |
76 } | 77 } |
77 | 78 |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 | 221 |
221 ASSERT_EQ(3U, invalidation_map.size()); | 222 ASSERT_EQ(3U, invalidation_map.size()); |
222 EXPECT_EQ(invalidation_map[BOOKMARKS].payload, payload); | 223 EXPECT_EQ(invalidation_map[BOOKMARKS].payload, payload); |
223 EXPECT_EQ(invalidation_map[PASSWORDS].payload, payload); | 224 EXPECT_EQ(invalidation_map[PASSWORDS].payload, payload); |
224 EXPECT_EQ(invalidation_map[AUTOFILL].payload, payload); | 225 EXPECT_EQ(invalidation_map[AUTOFILL].payload, payload); |
225 } | 226 } |
226 | 227 |
227 } // namespace | 228 } // namespace |
228 } // namespace sessions | 229 } // namespace sessions |
229 } // namespace syncer | 230 } // namespace syncer |
OLD | NEW |