[Sync] Move ModelType and related classes to 'syncer' namespace

chrome/browser/sync/test/integration/two_client_preferences_sync_test.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 "base/values.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
+#include "chrome/browser/sync/test/integration/preferences_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/translate/translate_prefs.h"
-#include "chrome/browser/sync/test/integration/sync_test.h"
-#include "chrome/browser/sync/test/integration/preferences_helper.h"
 #include "chrome/common/pref_names.h"
 
 using preferences_helper::AppendStringPref;
 using preferences_helper::BooleanPrefMatches;
 using preferences_helper::ChangeBooleanPref;
 using preferences_helper::ChangeIntegerPref;
 using preferences_helper::ChangeInt64Pref;
 using preferences_helper::ChangeListPref;
 using preferences_helper::ChangeStringPref;
 using preferences_helper::GetPrefs;
@@ skipping 55 matching lines @@
 // TCM ID - 3699293.
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
                        kSyncKeepEverythingSynced) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   DisableVerifier();
 
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kSyncKeepEverythingSynced));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncThemes));
 
-  GetClient(0)->DisableSyncForDatatype(syncable::THEMES);
+  GetClient(0)->DisableSyncForDatatype(syncer::THEMES);
   ASSERT_FALSE(BooleanPrefMatches(
       prefs::kSyncKeepEverythingSynced));
 }
 
 // TCM ID - 3661290.
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DisablePreferences) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   DisableVerifier();
 
   ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncPreferences));
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kPasswordManagerEnabled));
 
-  GetClient(1)->DisableSyncForDatatype(syncable::PREFERENCES);
+  GetClient(1)->DisableSyncForDatatype(syncer::PREFERENCES);
   ChangeBooleanPref(0, prefs::kPasswordManagerEnabled);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_FALSE(BooleanPrefMatches(
       prefs::kPasswordManagerEnabled));
 
-  GetClient(1)->EnableSyncForDatatype(syncable::PREFERENCES);
+  GetClient(1)->EnableSyncForDatatype(syncer::PREFERENCES);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kPasswordManagerEnabled));
 }
 
 // TCM ID - 3664292.
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DisableSync) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   DisableVerifier();
 
@@ skipping 24 matching lines @@
   DisableVerifier();
 
   ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncPreferences));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncBookmarks));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncThemes));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncExtensions));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncAutofill));
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kSyncKeepEverythingSynced));
 
-  GetClient(0)->DisableSyncForDatatype(syncable::PREFERENCES);
-  GetClient(1)->EnableSyncForDatatype(syncable::PREFERENCES);
-  GetClient(0)->DisableSyncForDatatype(syncable::AUTOFILL);
-  GetClient(1)->EnableSyncForDatatype(syncable::AUTOFILL);
-  GetClient(0)->DisableSyncForDatatype(syncable::BOOKMARKS);
-  GetClient(1)->EnableSyncForDatatype(syncable::BOOKMARKS);
-  GetClient(0)->DisableSyncForDatatype(syncable::EXTENSIONS);
-  GetClient(1)->EnableSyncForDatatype(syncable::EXTENSIONS);
-  GetClient(0)->DisableSyncForDatatype(syncable::THEMES);
-  GetClient(1)->EnableSyncForDatatype(syncable::THEMES);
+  GetClient(0)->DisableSyncForDatatype(syncer::PREFERENCES);
+  GetClient(1)->EnableSyncForDatatype(syncer::PREFERENCES);
+  GetClient(0)->DisableSyncForDatatype(syncer::AUTOFILL);
+  GetClient(1)->EnableSyncForDatatype(syncer::AUTOFILL);
+  GetClient(0)->DisableSyncForDatatype(syncer::BOOKMARKS);
+  GetClient(1)->EnableSyncForDatatype(syncer::BOOKMARKS);
+  GetClient(0)->DisableSyncForDatatype(syncer::EXTENSIONS);
+  GetClient(1)->EnableSyncForDatatype(syncer::EXTENSIONS);
+  GetClient(0)->DisableSyncForDatatype(syncer::THEMES);
+  GetClient(1)->EnableSyncForDatatype(syncer::THEMES);
 
   ASSERT_TRUE(AwaitQuiescence());
 
   ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncPreferences));
   ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncBookmarks));
   ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncThemes));
   ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncExtensions));
   ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncAutofill));
   ASSERT_FALSE(BooleanPrefMatches(
       prefs::kSyncKeepEverythingSynced));
@@ skipping 438 matching lines @@
   ChangeBooleanPref(1, prefs::kEnableScreenLock);
   ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableScreenLock));
 }
 #endif  // OS_CHROMEOS
 
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
                        SingleClientEnabledEncryption) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  ASSERT_TRUE(EnableEncryption(0, syncable::PREFERENCES));
+  ASSERT_TRUE(EnableEncryption(0, syncer::PREFERENCES));
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
-  ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(0, syncer::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
                        SingleClientEnabledEncryptionAndChanged) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kHomePageIsNewTabPage));
 
   ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
-  ASSERT_TRUE(EnableEncryption(0, syncable::PREFERENCES));
+  ASSERT_TRUE(EnableEncryption(0, syncer::PREFERENCES));
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
-  ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(0, syncer::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kHomePageIsNewTabPage));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
                        BothClientsEnabledEncryption) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  ASSERT_TRUE(EnableEncryption(0, syncable::PREFERENCES));
-  ASSERT_TRUE(EnableEncryption(1, syncable::PREFERENCES));
+  ASSERT_TRUE(EnableEncryption(0, syncer::PREFERENCES));
+  ASSERT_TRUE(EnableEncryption(1, syncer::PREFERENCES));
   ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
-  ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(0, syncer::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
                        SingleClientEnabledEncryptionBothChanged) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kHomePageIsNewTabPage));
   ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
 
-  ASSERT_TRUE(EnableEncryption(0, syncable::PREFERENCES));
+  ASSERT_TRUE(EnableEncryption(0, syncer::PREFERENCES));
   ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
   ChangeStringPref(1, prefs::kHomePage,
                                       "http://www.google.com/1");
   ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
-  ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(0, syncer::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kHomePageIsNewTabPage));
   ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
                        SingleClientEnabledEncryptionAndChangedMultipleTimes) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kHomePageIsNewTabPage));
 
   ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
-  ASSERT_TRUE(EnableEncryption(0, syncable::PREFERENCES));
+  ASSERT_TRUE(EnableEncryption(0, syncer::PREFERENCES));
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
-  ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(0, syncer::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kHomePageIsNewTabPage));
 
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 }