[Sync] Move BridgedSyncNotifier and ChromeSyncNotificationBridge to glue/

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/notifier/chrome_sync_notification_bridge.h"
+#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"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
 #include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h"
 #include "chrome/browser/sync/notifier/sync_notifier_observer.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/profile_mock.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_details.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace sync_notifier {
+namespace browser_sync {
 namespace {
 
 using ::testing::Mock;
 using ::testing::NiceMock;
 using ::testing::StrictMock;
 using content::BrowserThread;
 
 // Receives a ChromeSyncNotificationBridge to register to, and an expected
 // ModelTypePayloadMap. ReceivedProperNotification() will return true only
 // 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 SyncNotifierObserver {
+class FakeSyncNotifierObserverIO
+    : public sync_notifier::SyncNotifierObserver {
  public:
   FakeSyncNotifierObserverIO(
       ChromeSyncNotificationBridge* bridge,
       const syncable::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,
-      IncomingNotificationSource source) OVERRIDE {
+      sync_notifier::IncomingNotificationSource source) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     notification_count_++;
-    if (source != LOCAL_NOTIFICATION) {
+    if (source != sync_notifier::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 OnNotificationStateChange(bool notifications_enabled) {
     NOTREACHED();
@@ skipping 108 matching lines @@
   bool io_observer_notification_failure_;
   ChromeSyncNotificationBridge bridge_;
   base::WaitableEvent done_;
 };
 
 // Adds an observer on the UI thread, triggers a refresh notification, and
 // ensures the bridge posts a LOCAL_NOTIFICATION with the proper payload to it.
 TEST_F(ChromeSyncNotificationBridgeTest, Basic) {
   syncable::ModelTypePayloadMap payload_map;
   payload_map[syncable::SESSIONS] = "";
-  StrictMock<MockSyncNotifierObserver> observer;
+  StrictMock<sync_notifier::MockSyncNotifierObserver> observer;
   EXPECT_CALL(observer,
-              OnIncomingNotification(payload_map, LOCAL_NOTIFICATION));
+              OnIncomingNotification(payload_map,
+                                     sync_notifier::LOCAL_NOTIFICATION));
   bridge_.AddObserver(&observer);
   TriggerRefreshNotification();
   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] = "";
   CreateObserverWithExpectedPayload(payload_map);
   TriggerRefreshNotification();
   VerifyAndDestroyObserver();
 }
 
 }  // namespace
-}  // namespace sync_notifier
+}  // namespace browser_sync