[Sync] Move BridgedSyncNotifier and ChromeSyncNotificationBridge to glue/

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/notifier/bridged_sync_notifier.h"
+#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/notifier/chrome_sync_notification_bridge.h"
+#include "chrome/browser/sync/glue/chrome_sync_notification_bridge.h"
 #include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h"
 #include "chrome/browser/sync/notifier/sync_notifier.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/model_type_test_util.h"
 #include "chrome/test/base/profile_mock.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::NiceMock;
 using ::testing::StrictMock;
 using content::BrowserThread;
 using syncable::HasModelTypes;
 
 class MockChromeSyncNotificationBridge : public ChromeSyncNotificationBridge {
  public:
   MockChromeSyncNotificationBridge()
       : ChromeSyncNotificationBridge(&mock_profile_) {}
   virtual ~MockChromeSyncNotificationBridge() {}
 
-  MOCK_METHOD1(AddObserver, void(SyncNotifierObserver*));
-  MOCK_METHOD1(RemoveObserver, void(SyncNotifierObserver*));
+  MOCK_METHOD1(AddObserver, void(sync_notifier::SyncNotifierObserver*));
+  MOCK_METHOD1(RemoveObserver, void(sync_notifier::SyncNotifierObserver*));
  private:
   NiceMock<ProfileMock> mock_profile_;
 };
 
-class MockSyncNotifier : public SyncNotifier {
+class MockSyncNotifier : public sync_notifier::SyncNotifier {
  public:
   MockSyncNotifier() {}
   virtual ~MockSyncNotifier() {}
 
-  MOCK_METHOD1(AddObserver, void(SyncNotifierObserver*));
-  MOCK_METHOD1(RemoveObserver, void(SyncNotifierObserver*));
+  MOCK_METHOD1(AddObserver, void(sync_notifier::SyncNotifierObserver*));
+  MOCK_METHOD1(RemoveObserver, void(sync_notifier::SyncNotifierObserver*));
   MOCK_METHOD1(SetUniqueId, void(const std::string&));
   MOCK_METHOD1(SetState, 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));
 };
 
 // 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_.
         bridged_notifier_(&mock_bridge_, mock_delegate_) {}
   virtual ~BridgedSyncNotifierTest() {}
 
  protected:
   MessageLoop ui_loop_;
   content::TestBrowserThread ui_thread_;
   StrictMock<MockChromeSyncNotificationBridge> mock_bridge_;
   MockSyncNotifier* mock_delegate_;
   BridgedSyncNotifier bridged_notifier_;
 };
 
 TEST_F(BridgedSyncNotifierTest, AddObserver) {
-  MockSyncNotifierObserver observer;
+  sync_notifier::MockSyncNotifierObserver observer;
   EXPECT_CALL(mock_bridge_, AddObserver(&observer));
   EXPECT_CALL(*mock_delegate_, AddObserver(&observer));
   bridged_notifier_.AddObserver(&observer);
 }
 
 TEST_F(BridgedSyncNotifierTest, RemoveObserver) {
-  MockSyncNotifierObserver observer;
+  sync_notifier::MockSyncNotifierObserver observer;
   EXPECT_CALL(mock_bridge_, RemoveObserver(&observer));
   EXPECT_CALL(*mock_delegate_, RemoveObserver(&observer));
   bridged_notifier_.RemoveObserver(&observer);
 }
 
 TEST_F(BridgedSyncNotifierTest, SetUniqueId) {
   std::string unique_id = "unique id";
   EXPECT_CALL(*mock_delegate_, SetUniqueId(unique_id));
   bridged_notifier_.SetUniqueId(unique_id);
 }
@@ skipping 20 matching lines @@
 }
 
 TEST_F(BridgedSyncNotifierTest, SendNotification) {
   syncable::ModelTypeSet changed_types(syncable::SESSIONS,
                                        syncable::EXTENSIONS);
   EXPECT_CALL(*mock_delegate_, SendNotification(HasModelTypes(changed_types)));
   bridged_notifier_.SendNotification(changed_types);
 }
 
 }  // namespace
-}  // namespace sync_notifier
+}  // namespace browser_sync