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

chrome/browser/sync/glue/chrome_sync_notification_bridge_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/chrome_sync_notification_bridge.h"
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 24 matching lines @@
 // if the observer has received a notification with the proper source and
 // payload.
 // Note: Because this object lives on the IO thread, we use a fake (vs a mock)
 // so we don't have to worry about possible thread safety issues within
 // GTest/GMock.
 class FakeSyncNotifierObserverIO
     : public syncer::SyncNotifierObserver {
  public:
   FakeSyncNotifierObserverIO(
       ChromeSyncNotificationBridge* bridge,
-      const syncable::ModelTypePayloadMap& expected_payloads)
+      const syncer::ModelTypePayloadMap& expected_payloads)
       : bridge_(bridge),
         received_improper_notification_(false),
         notification_count_(0),
         expected_payloads_(expected_payloads) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     bridge_->AddObserver(this);
   }
   virtual ~FakeSyncNotifierObserverIO() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     bridge_->RemoveObserver(this);
   }
 
   // SyncNotifierObserver implementation.
   virtual void OnIncomingNotification(
-      const syncable::ModelTypePayloadMap& type_payloads,
+      const syncer::ModelTypePayloadMap& type_payloads,
       syncer::IncomingNotificationSource source) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     notification_count_++;
     if (source != syncer::LOCAL_NOTIFICATION) {
       LOG(ERROR) << "Received notification with wrong source.";
       received_improper_notification_ = true;
     }
     if (expected_payloads_ != type_payloads) {
       LOG(ERROR) << "Received wrong payload.";
       received_improper_notification_ = true;
     }
   }
   virtual void OnNotificationsEnabled() OVERRIDE {
     NOTREACHED();
   }
   virtual void OnNotificationsDisabled(
       syncer::NotificationsDisabledReason reason) OVERRIDE {
     NOTREACHED();
   }
 
   bool ReceivedProperNotification() const {
     return (notification_count_ == 1) && !received_improper_notification_;
   }
 
  private:
   ChromeSyncNotificationBridge* bridge_;
   bool received_improper_notification_;
   size_t notification_count_;
-  syncable::ModelTypePayloadMap expected_payloads_;
+  syncer::ModelTypePayloadMap expected_payloads_;
 };
 
 class ChromeSyncNotificationBridgeTest : public testing::Test {
  public:
   ChromeSyncNotificationBridgeTest()
       : ui_thread_(BrowserThread::UI, &ui_loop_),
         io_thread_(BrowserThread::IO),
         io_observer_(NULL),
         io_observer_notification_failure_(false),
         bridge_(&mock_profile_),
@@ skipping 26 matching lines @@
   void VerifyAndDestroyObserver() {
     ASSERT_TRUE(BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&ChromeSyncNotificationBridgeTest::
                        VerifyAndDestroyObserverOnIOThread,
                    base::Unretained(this))));
   }
 
   void CreateObserverOnIOThread(
-      syncable::ModelTypePayloadMap expected_payloads) {
+      syncer::ModelTypePayloadMap expected_payloads) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     io_observer_ = new FakeSyncNotifierObserverIO(&bridge_,
                                                   expected_payloads);
   }
 
   void CreateObserverWithExpectedPayload(
-      syncable::ModelTypePayloadMap expected_payloads) {
+      syncer::ModelTypePayloadMap expected_payloads) {
     ASSERT_TRUE(BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&ChromeSyncNotificationBridgeTest::CreateObserverOnIOThread,
                    base::Unretained(this),
                    expected_payloads)));
     BlockForIOThread();
   }
 
   void SignalOnIOThread() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     done_.Signal();
   }
 
   void BlockForIOThread() {
     done_.Reset();
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&ChromeSyncNotificationBridgeTest::SignalOnIOThread,
                    base::Unretained(this)));
     done_.TimedWait(TestTimeouts::action_timeout());
     if (!done_.IsSignaled())
       ADD_FAILURE() << "Timed out waiting for IO thread.";
   }
 
   void TriggerRefreshNotification(
       int type,
-      const syncable::ModelTypePayloadMap& payload_map) {
+      const syncer::ModelTypePayloadMap& payload_map) {
     content::NotificationService::current()->Notify(
         type,
         content::Source<Profile>(&mock_profile_),
-        content::Details<const syncable::ModelTypePayloadMap>(&payload_map));
+        content::Details<const syncer::ModelTypePayloadMap>(&payload_map));
   }
 
   MessageLoop ui_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread io_thread_;
   NiceMock<ProfileMock> mock_profile_;
   // Created/used/destroyed on I/O thread.
   FakeSyncNotifierObserverIO* io_observer_;
   bool io_observer_notification_failure_;
   ChromeSyncNotificationBridge bridge_;
   base::WaitableEvent done_;
 };
 
 // Adds an observer on the UI thread, triggers a local refresh notification, and
 // ensures the bridge posts a LOCAL_NOTIFICATION with the proper payload to it.
 TEST_F(ChromeSyncNotificationBridgeTest, LocalNotification) {
-  syncable::ModelTypePayloadMap payload_map;
-  payload_map[syncable::SESSIONS] = "";
+  syncer::ModelTypePayloadMap payload_map;
+  payload_map[syncer::SESSIONS] = "";
   StrictMock<syncer::MockSyncNotifierObserver> observer;
   EXPECT_CALL(observer,
               OnIncomingNotification(payload_map,
                                      syncer::LOCAL_NOTIFICATION));
   bridge_.AddObserver(&observer);
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
                              payload_map);
   ui_loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
 }
 
 // Adds an observer on the UI thread, triggers a remote refresh notification,
 // and ensures the bridge posts a REMOTE_NOTIFICATION with the proper payload
 // to it.
 TEST_F(ChromeSyncNotificationBridgeTest, RemoteNotification) {
-  syncable::ModelTypePayloadMap payload_map;
-  payload_map[syncable::BOOKMARKS] = "";
+  syncer::ModelTypePayloadMap payload_map;
+  payload_map[syncer::BOOKMARKS] = "";
   StrictMock<syncer::MockSyncNotifierObserver> observer;
   EXPECT_CALL(observer,
               OnIncomingNotification(payload_map,
                                      syncer::REMOTE_NOTIFICATION));
   bridge_.AddObserver(&observer);
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,
                              payload_map);
   ui_loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
 }
 
 // Adds an observer on the UI thread, triggers a local refresh notification
 // with empty payload map and ensures the bridge posts a
 // LOCAL_NOTIFICATION with the proper payload to it.
 TEST_F(ChromeSyncNotificationBridgeTest, LocalNotificationEmptyPayloadMap) {
-  const syncable::ModelTypeSet enabled_types(
-      syncable::BOOKMARKS, syncable::PASSWORDS);
-  const syncable::ModelTypePayloadMap enabled_types_payload_map =
-      syncable::ModelTypePayloadMapFromEnumSet(enabled_types, std::string());
+  const syncer::ModelTypeSet enabled_types(
+      syncer::BOOKMARKS, syncer::PASSWORDS);
+  const syncer::ModelTypePayloadMap enabled_types_payload_map =
+      syncer::ModelTypePayloadMapFromEnumSet(enabled_types, std::string());
 
   StrictMock<syncer::MockSyncNotifierObserver> observer;
   EXPECT_CALL(observer,
               OnIncomingNotification(enabled_types_payload_map,
                                      syncer::LOCAL_NOTIFICATION));
   bridge_.AddObserver(&observer);
   // Set enabled types on the bridge.
   bridge_.UpdateEnabledTypes(enabled_types);
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
-                             syncable::ModelTypePayloadMap());
+                             syncer::ModelTypePayloadMap());
   ui_loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
 }
 
 // Adds an observer on the UI thread, triggers a remote refresh notification
 // with empty payload map and ensures the bridge posts a
 // REMOTE_NOTIFICATION with the proper payload to it.
 TEST_F(ChromeSyncNotificationBridgeTest, RemoteNotificationEmptyPayloadMap) {
-  const syncable::ModelTypeSet enabled_types(
-      syncable::BOOKMARKS, syncable::TYPED_URLS);
-  const syncable::ModelTypePayloadMap enabled_types_payload_map =
-      syncable::ModelTypePayloadMapFromEnumSet(enabled_types, std::string());
+  const syncer::ModelTypeSet enabled_types(
+      syncer::BOOKMARKS, syncer::TYPED_URLS);
+  const syncer::ModelTypePayloadMap enabled_types_payload_map =
+      syncer::ModelTypePayloadMapFromEnumSet(enabled_types, std::string());
 
   StrictMock<syncer::MockSyncNotifierObserver> observer;
   EXPECT_CALL(observer,
               OnIncomingNotification(enabled_types_payload_map,
                                      syncer::REMOTE_NOTIFICATION));
   bridge_.AddObserver(&observer);
   // Set enabled types on the bridge.
   bridge_.UpdateEnabledTypes(enabled_types);
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,
-                             syncable::ModelTypePayloadMap());
+                             syncer::ModelTypePayloadMap());
   ui_loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
 }
 
 // Adds an observer on the I/O thread. Then triggers a refresh notification on
 // the UI thread. We finally verify the proper notification was received by the
 // observer and destroy it on the I/O thread.
 TEST_F(ChromeSyncNotificationBridgeTest, BasicThreaded) {
-  syncable::ModelTypePayloadMap payload_map;
-  payload_map[syncable::SESSIONS] = "";
+  syncer::ModelTypePayloadMap payload_map;
+  payload_map[syncer::SESSIONS] = "";
   CreateObserverWithExpectedPayload(payload_map);
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
                              payload_map);
   VerifyAndDestroyObserver();
 }
 
 }  // namespace
 }  // namespace browser_sync