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

chrome/browser/sync/glue/bridged_sync_notifier_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 "chrome/browser/sync/glue/bridged_sync_notifier.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/sync/glue/chrome_sync_notification_bridge.h"
 #include "chrome/test/base/profile_mock.h"
 #include "content/public/test/test_browser_thread.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/base/model_type_test_util.h"
 #include "sync/notifier/mock_sync_notifier_observer.h"
 #include "sync/notifier/sync_notifier.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace browser_sync {
 namespace {
 
 using ::testing::NiceMock;
 using ::testing::StrictMock;
 using content::BrowserThread;
-using syncer::syncable::HasModelTypes;
+using syncer::HasModelTypes;
 
 class MockChromeSyncNotificationBridge : public ChromeSyncNotificationBridge {
  public:
   MockChromeSyncNotificationBridge()
       : ChromeSyncNotificationBridge(&mock_profile_) {}
   virtual ~MockChromeSyncNotificationBridge() {}
 
   MOCK_METHOD1(AddObserver, void(syncer::SyncNotifierObserver*));
   MOCK_METHOD1(RemoveObserver, void(syncer::SyncNotifierObserver*));
  private:
   NiceMock<ProfileMock> mock_profile_;
 };
 
 class MockSyncNotifier : public syncer::SyncNotifier {
  public:
   MockSyncNotifier() {}
   virtual ~MockSyncNotifier() {}
 
   MOCK_METHOD1(AddObserver, void(syncer::SyncNotifierObserver*));
   MOCK_METHOD1(RemoveObserver, void(syncer::SyncNotifierObserver*));
   MOCK_METHOD1(SetUniqueId, void(const std::string&));
   MOCK_METHOD1(SetStateDeprecated, void(const std::string&));
   MOCK_METHOD2(UpdateCredentials, void(const std::string&, const std::string&));
-  MOCK_METHOD1(UpdateEnabledTypes, void(syncable::ModelTypeSet));
-  MOCK_METHOD1(SendNotification, void(syncable::ModelTypeSet));
+  MOCK_METHOD1(UpdateEnabledTypes, void(syncer::ModelTypeSet));
+  MOCK_METHOD1(SendNotification, void(syncer::ModelTypeSet));
 };
 
 // All tests just verify that each call is passed through to the delegate, with
 // the exception of AddObserver/RemoveObserver, which also verify the observer
 // is registered with the bridge.
 class BridgedSyncNotifierTest : public testing::Test {
  public:
   BridgedSyncNotifierTest()
       : ui_thread_(BrowserThread::UI, &ui_loop_),
         mock_delegate_(new MockSyncNotifier),  // Owned by bridged_notifier_.
@@ skipping 35 matching lines @@
 }
 
 TEST_F(BridgedSyncNotifierTest, UpdateCredentials) {
   std::string email = "email";
   std::string token = "token";
   EXPECT_CALL(*mock_delegate_, UpdateCredentials(email, token));
   bridged_notifier_.UpdateCredentials(email, token);
 }
 
 TEST_F(BridgedSyncNotifierTest, UpdateEnabledTypes) {
-  syncable::ModelTypeSet enabled_types(syncable::BOOKMARKS,
-                                       syncable::PREFERENCES);
+  syncer::ModelTypeSet enabled_types(syncer::BOOKMARKS, syncer::PREFERENCES);
   EXPECT_CALL(*mock_delegate_,
               UpdateEnabledTypes(HasModelTypes(enabled_types)));
   bridged_notifier_.UpdateEnabledTypes(enabled_types);
 }
 
 TEST_F(BridgedSyncNotifierTest, SendNotification) {
-  syncable::ModelTypeSet changed_types(syncable::SESSIONS,
-                                       syncable::EXTENSIONS);
+  syncer::ModelTypeSet changed_types(syncer::SESSIONS, syncer::EXTENSIONS);
   EXPECT_CALL(*mock_delegate_, SendNotification(HasModelTypes(changed_types)));
   bridged_notifier_.SendNotification(changed_types);
 }
 
 }  // namespace
 }  // namespace browser_sync