| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 context_.reset( | 58 context_.reset( |
| 59 new SyncSessionContext( | 59 new SyncSessionContext( |
| 60 NULL, | 60 NULL, |
| 61 NULL, | 61 NULL, |
| 62 workers, | 62 workers, |
| 63 &extensions_activity_monitor_, | 63 &extensions_activity_monitor_, |
| 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 false, // force enable pre-commit GU avoidance experiment |
| 68 "fake_invalidator_client_id")); | 69 "fake_invalidator_client_id")); |
| 69 context_->set_routing_info(routes_); | 70 context_->set_routing_info(routes_); |
| 70 | 71 |
| 71 session_.reset(MakeSession()); | 72 session_.reset(MakeSession()); |
| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 | 196 |
| 196 ASSERT_EQ(3U, invalidation_map.size()); | 197 ASSERT_EQ(3U, invalidation_map.size()); |
| 197 EXPECT_EQ(invalidation_map[BOOKMARKS].payload, payload); | 198 EXPECT_EQ(invalidation_map[BOOKMARKS].payload, payload); |
| 198 EXPECT_EQ(invalidation_map[PASSWORDS].payload, payload); | 199 EXPECT_EQ(invalidation_map[PASSWORDS].payload, payload); |
| 199 EXPECT_EQ(invalidation_map[AUTOFILL].payload, payload); | 200 EXPECT_EQ(invalidation_map[AUTOFILL].payload, payload); |
| 200 } | 201 } |
| 201 | 202 |
| 202 } // namespace | 203 } // namespace |
| 203 } // namespace sessions | 204 } // namespace sessions |
| 204 } // namespace syncer | 205 } // namespace syncer |
| OLD | NEW |