| OLD | NEW |
| 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/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 | 60 |
| 61 context_.reset( | 61 context_.reset( |
| 62 new SyncSessionContext( | 62 new SyncSessionContext( |
| 63 NULL, | 63 NULL, |
| 64 NULL, | 64 NULL, |
| 65 workers, | 65 workers, |
| 66 &extensions_activity_monitor_, | 66 &extensions_activity_monitor_, |
| 67 throttled_data_type_tracker_.get(), | 67 throttled_data_type_tracker_.get(), |
| 68 std::vector<SyncEngineEventListener*>(), | 68 std::vector<SyncEngineEventListener*>(), |
| 69 NULL, | 69 NULL, |
| 70 NULL)); | 70 NULL, |
| 71 true /* enable keystore encryption */)); |
| 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 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 495 | 496 |
| 496 ASSERT_EQ(3U, types_with_payloads.size()); | 497 ASSERT_EQ(3U, types_with_payloads.size()); |
| 497 EXPECT_EQ(types_with_payloads[BOOKMARKS], payload); | 498 EXPECT_EQ(types_with_payloads[BOOKMARKS], payload); |
| 498 EXPECT_EQ(types_with_payloads[PASSWORDS], payload); | 499 EXPECT_EQ(types_with_payloads[PASSWORDS], payload); |
| 499 EXPECT_EQ(types_with_payloads[AUTOFILL], payload); | 500 EXPECT_EQ(types_with_payloads[AUTOFILL], payload); |
| 500 } | 501 } |
| 501 | 502 |
| 502 } // namespace | 503 } // namespace |
| 503 } // namespace sessions | 504 } // namespace sessions |
| 504 } // namespace syncer | 505 } // namespace syncer |
| OLD | NEW |