[Sync] Move //components/sync_driver to //components/sync/driver.

components/sync/driver/sync_prefs_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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>
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "components/pref_registry/testing_pref_service_syncable.h"
 #include "components/prefs/pref_notifier_impl.h"
 #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"
 
 namespace sync_driver {
 
 namespace {
 
 using ::testing::InSequence;
 using ::testing::StrictMock;
 
@@ skipping 81 matching lines @@
 
 TEST_F(SyncPrefsTest, PreferredTypesKeepEverythingSynced) {
   SyncPrefs sync_prefs(&pref_service_);
 
   EXPECT_TRUE(sync_prefs.HasKeepEverythingSynced());
 
   const syncer::ModelTypeSet user_types = syncer::UserTypes();
   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);
     EXPECT_EQ(user_types, sync_prefs.GetPreferredDataTypes(user_types));
   }
 }
 
 TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) {
   SyncPrefs sync_prefs(&pref_service_);
 
   sync_prefs.SetKeepEverythingSynced(false);
 
   const syncer::ModelTypeSet user_types = syncer::UserTypes();
   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);
     if (it.Get() == syncer::AUTOFILL) {
       expected_preferred_types.Put(syncer::AUTOFILL_PROFILE);
       expected_preferred_types.Put(syncer::AUTOFILL_WALLET_DATA);
       expected_preferred_types.Put(syncer::AUTOFILL_WALLET_METADATA);
     }
     if (it.Get() == syncer::PREFERENCES) {
       expected_preferred_types.Put(syncer::DICTIONARY);
@@ skipping 104 matching lines @@
 
   EXPECT_EQ(versions.size(), versions2.size());
   for (auto map_iter : versions2) {
     EXPECT_EQ(versions[map_iter.first], map_iter.second);
   }
 }
 
 }  // namespace
 
 }  // namespace sync_driver