| 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 "components/sync_driver/sync_prefs.h" | 5 #include "components/sync_driver/sync_prefs.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 | 10 |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
| 13 #include "base/time/time.h" | 13 #include "base/time/time.h" |
| 14 #include "components/pref_registry/testing_pref_service_syncable.h" | 14 #include "components/pref_registry/testing_pref_service_syncable.h" |
| 15 #include "components/prefs/pref_notifier_impl.h" | 15 #include "components/prefs/pref_notifier_impl.h" |
| 16 #include "components/prefs/pref_value_store.h" | 16 #include "components/prefs/pref_value_store.h" |
| 17 #include "components/prefs/testing_pref_service.h" | 17 #include "components/prefs/testing_pref_service.h" |
| 18 #include "components/sync/base/model_type.h" |
| 18 #include "components/sync_driver/pref_names.h" | 19 #include "components/sync_driver/pref_names.h" |
| 19 #include "sync/internal_api/public/base/model_type.h" | |
| 20 #include "testing/gmock/include/gmock/gmock.h" | 20 #include "testing/gmock/include/gmock/gmock.h" |
| 21 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
| 22 | 22 |
| 23 namespace sync_driver { | 23 namespace sync_driver { |
| 24 | 24 |
| 25 namespace { | 25 namespace { |
| 26 | 26 |
| 27 using ::testing::InSequence; | 27 using ::testing::InSequence; |
| 28 using ::testing::StrictMock; | 28 using ::testing::StrictMock; |
| 29 | 29 |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 | 255 |
| 256 EXPECT_EQ(versions.size(), versions2.size()); | 256 EXPECT_EQ(versions.size(), versions2.size()); |
| 257 for (auto map_iter : versions2) { | 257 for (auto map_iter : versions2) { |
| 258 EXPECT_EQ(versions[map_iter.first], map_iter.second); | 258 EXPECT_EQ(versions[map_iter.first], map_iter.second); |
| 259 } | 259 } |
| 260 } | 260 } |
| 261 | 261 |
| 262 } // namespace | 262 } // namespace |
| 263 | 263 |
| 264 } // namespace sync_driver | 264 } // namespace sync_driver |
| OLD | NEW |