OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/password_manager/core/browser/password_syncable_service.h" | 5 #include "components/password_manager/core/browser/password_syncable_service.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/basictypes.h" | |
12 #include "base/location.h" | 11 #include "base/location.h" |
| 12 #include "base/macros.h" |
13 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
17 #include "components/password_manager/core/browser/mock_password_store.h" | 17 #include "components/password_manager/core/browser/mock_password_store.h" |
18 #include "sync/api/sync_change_processor.h" | 18 #include "sync/api/sync_change_processor.h" |
19 #include "sync/api/sync_error.h" | 19 #include "sync/api/sync_error.h" |
20 #include "sync/api/sync_error_factory_mock.h" | 20 #include "sync/api/sync_error_factory_mock.h" |
21 #include "testing/gmock/include/gmock/gmock.h" | 21 #include "testing/gmock/include/gmock/gmock.h" |
22 #include "testing/gtest/include/gtest/gtest.h" | 22 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 | 594 |
595 service()->MergeDataAndStartSyncing(syncer::PASSWORDS, | 595 service()->MergeDataAndStartSyncing(syncer::PASSWORDS, |
596 sync_data, | 596 sync_data, |
597 processor_.Pass(), | 597 processor_.Pass(), |
598 scoped_ptr<syncer::SyncErrorFactory>()); | 598 scoped_ptr<syncer::SyncErrorFactory>()); |
599 } | 599 } |
600 | 600 |
601 } // namespace | 601 } // namespace |
602 | 602 |
603 } // namespace password_manager | 603 } // namespace password_manager |
OLD | NEW |