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

chrome/browser/sync/test/integration/two_client_sessions_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/memory/scoped_vector.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/passwords_helper.h"
 #include "chrome/browser/sync/test/integration/sessions_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
@@ skipping 48 matching lines @@
   ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
                        SingleClientEnabledEncryption) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   ASSERT_TRUE(CheckInitialState(0));
   ASSERT_TRUE(CheckInitialState(1));
 
-  ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
+  ASSERT_TRUE(EnableEncryption(0, syncer::SESSIONS));
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(IsEncrypted(0, syncable::SESSIONS));
-  ASSERT_TRUE(IsEncrypted(1, syncable::SESSIONS));
+  ASSERT_TRUE(IsEncrypted(0, syncer::SESSIONS));
+  ASSERT_TRUE(IsEncrypted(1, syncer::SESSIONS));
 
   // Should enable encryption for all other types as well. Just check a subset.
-  ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
-  ASSERT_TRUE(IsEncrypted(1, syncable::BOOKMARKS));
-  ASSERT_TRUE(IsEncrypted(1, syncable::APPS));
+  ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(1, syncer::BOOKMARKS));
+  ASSERT_TRUE(IsEncrypted(1, syncer::APPS));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
                        SingleClientEnabledEncryptionAndChanged) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   ASSERT_TRUE(CheckInitialState(0));
   ASSERT_TRUE(CheckInitialState(1));
 
   ScopedWindowMap client0_windows;
   ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
       client0_windows.GetMutable()));
-  ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
+  ASSERT_TRUE(EnableEncryption(0, syncer::SESSIONS));
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   // Get foreign session data from client 1.
-  ASSERT_TRUE(IsEncrypted(1, syncable::SESSIONS));
+  ASSERT_TRUE(IsEncrypted(1, syncer::SESSIONS));
   SyncedSessionVector sessions1;
   ASSERT_TRUE(GetSessionData(1, &sessions1));
 
   // Verify client 1's foreign session matches client 0 current window.
   ASSERT_EQ(1U, sessions1.size());
   ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
                        BothClientsEnabledEncryption) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   ASSERT_TRUE(CheckInitialState(0));
   ASSERT_TRUE(CheckInitialState(1));
 
-  ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
-  ASSERT_TRUE(EnableEncryption(1, syncable::SESSIONS));
+  ASSERT_TRUE(EnableEncryption(0, syncer::SESSIONS));
+  ASSERT_TRUE(EnableEncryption(1, syncer::SESSIONS));
   ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(IsEncrypted(0, syncable::SESSIONS));
-  ASSERT_TRUE(IsEncrypted(1, syncable::SESSIONS));
+  ASSERT_TRUE(IsEncrypted(0, syncer::SESSIONS));
+  ASSERT_TRUE(IsEncrypted(1, syncer::SESSIONS));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, BothChanged) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   ASSERT_TRUE(CheckInitialState(0));
   ASSERT_TRUE(CheckInitialState(1));
 
   // Open tabs on both clients and retain window information.
   ScopedWindowMap client0_windows;
@@ skipping 70 matching lines @@
   ASSERT_FALSE(GetSessionData(1, &sessions1));
 
   // Client 0 becomes active again with a new tab.
   ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2),
       client0_windows.GetMutable()));
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(GetSessionData(1, &sessions1));
   ASSERT_EQ(1U, sessions1.size());
   ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
 }