| Index: components/sync/driver/sync_prefs_unittest.cc
|
| diff --git a/components/sync_driver/sync_prefs_unittest.cc b/components/sync/driver/sync_prefs_unittest.cc
|
| similarity index 98%
|
| rename from components/sync_driver/sync_prefs_unittest.cc
|
| rename to components/sync/driver/sync_prefs_unittest.cc
|
| index 04b86c598dc7992331f5150764785e1f2d7c5b23..16c9899e3995524b8a345569d33211fd7cc3da4e 100644
|
| --- a/components/sync_driver/sync_prefs_unittest.cc
|
| +++ b/components/sync/driver/sync_prefs_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/sync_driver/sync_prefs.h"
|
| +#include "components/sync/driver/sync_prefs.h"
|
|
|
| #include <stdint.h>
|
|
|
| @@ -16,7 +16,7 @@
|
| #include "components/prefs/pref_value_store.h"
|
| #include "components/prefs/testing_pref_service.h"
|
| #include "components/sync/base/model_type.h"
|
| -#include "components/sync_driver/pref_names.h"
|
| +#include "components/sync/driver/pref_names.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -118,8 +118,7 @@ TEST_F(SyncPrefsTest, PreferredTypesKeepEverythingSynced) {
|
| EXPECT_EQ(user_types, sync_prefs.GetPreferredDataTypes(user_types));
|
| const syncer::ModelTypeSet user_visible_types = syncer::UserSelectableTypes();
|
| for (syncer::ModelTypeSet::Iterator it = user_visible_types.First();
|
| - it.Good();
|
| - it.Inc()) {
|
| + it.Good(); it.Inc()) {
|
| syncer::ModelTypeSet preferred_types;
|
| preferred_types.Put(it.Get());
|
| sync_prefs.SetPreferredDataTypes(user_types, preferred_types);
|
| @@ -136,8 +135,7 @@ TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) {
|
| EXPECT_NE(user_types, sync_prefs.GetPreferredDataTypes(user_types));
|
| const syncer::ModelTypeSet user_visible_types = syncer::UserSelectableTypes();
|
| for (syncer::ModelTypeSet::Iterator it = user_visible_types.First();
|
| - it.Good();
|
| - it.Inc()) {
|
| + it.Good(); it.Inc()) {
|
| syncer::ModelTypeSet preferred_types;
|
| preferred_types.Put(it.Get());
|
| syncer::ModelTypeSet expected_preferred_types(preferred_types);
|
|
|