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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 context_.reset( | 60 context_.reset( |
61 new SyncSessionContext( | 61 new SyncSessionContext( |
62 NULL, | 62 NULL, |
63 NULL, | 63 NULL, |
64 workers, | 64 workers, |
65 &extensions_activity_monitor_, | 65 &extensions_activity_monitor_, |
66 throttled_data_type_tracker_.get(), | 66 throttled_data_type_tracker_.get(), |
67 std::vector<SyncEngineEventListener*>(), | 67 std::vector<SyncEngineEventListener*>(), |
68 NULL, | 68 NULL, |
69 NULL, | 69 NULL, |
70 true /* enable keystore encryption */)); | 70 true, // enable keystore encryption |
| 71 "fake_invalidator_client_id")); |
71 context_->set_routing_info(routes_); | 72 context_->set_routing_info(routes_); |
72 | 73 |
73 session_.reset(MakeSession()); | 74 session_.reset(MakeSession()); |
74 throttled_data_type_tracker_.reset(new ThrottledDataTypeTracker(NULL)); | 75 throttled_data_type_tracker_.reset(new ThrottledDataTypeTracker(NULL)); |
75 } | 76 } |
76 virtual void TearDown() { | 77 virtual void TearDown() { |
77 session_.reset(); | 78 session_.reset(); |
78 context_.reset(); | 79 context_.reset(); |
79 } | 80 } |
80 | 81 |
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
433 | 434 |
434 ASSERT_EQ(3U, invalidation_map.size()); | 435 ASSERT_EQ(3U, invalidation_map.size()); |
435 EXPECT_EQ(invalidation_map[BOOKMARKS].payload, payload); | 436 EXPECT_EQ(invalidation_map[BOOKMARKS].payload, payload); |
436 EXPECT_EQ(invalidation_map[PASSWORDS].payload, payload); | 437 EXPECT_EQ(invalidation_map[PASSWORDS].payload, payload); |
437 EXPECT_EQ(invalidation_map[AUTOFILL].payload, payload); | 438 EXPECT_EQ(invalidation_map[AUTOFILL].payload, payload); |
438 } | 439 } |
439 | 440 |
440 } // namespace | 441 } // namespace |
441 } // namespace sessions | 442 } // namespace sessions |
442 } // namespace syncer | 443 } // namespace syncer |
OLD | NEW |