[Sync] Avoid ObserverListThreadSafe in ChromeSyncNotificationBridge

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"
@@ skipping 11 matching lines @@
 namespace browser_sync {
 namespace {
 
 using ::testing::NiceMock;
 using ::testing::StrictMock;
 using content::BrowserThread;
 using syncer::HasModelTypes;
 
 class MockChromeSyncNotificationBridge : public ChromeSyncNotificationBridge {
  public:
-  MockChromeSyncNotificationBridge()
-      : ChromeSyncNotificationBridge(&mock_profile_) {}
+  MockChromeSyncNotificationBridge(
+      const Profile* profile,
+      const scoped_refptr<base::SequencedTaskRunner>& sync_task_runner)
+      : ChromeSyncNotificationBridge(profile, sync_task_runner) {}
   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(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_bridge_(&mock_profile_, ui_loop_.message_loop_proxy()),
         mock_delegate_(new MockSyncNotifier),  // Owned by bridged_notifier_.
         bridged_notifier_(&mock_bridge_, mock_delegate_) {}
   virtual ~BridgedSyncNotifierTest() {}
 
  protected:
   MessageLoop ui_loop_;
   content::TestBrowserThread ui_thread_;
+  NiceMock<ProfileMock> mock_profile_;
   StrictMock<MockChromeSyncNotificationBridge> mock_bridge_;
   MockSyncNotifier* mock_delegate_;
   BridgedSyncNotifier bridged_notifier_;
 };
 
 TEST_F(BridgedSyncNotifierTest, AddObserver) {
   syncer::MockSyncNotifierObserver observer;
   EXPECT_CALL(mock_bridge_, AddObserver(&observer));
   EXPECT_CALL(*mock_delegate_, AddObserver(&observer));
   bridged_notifier_.AddObserver(&observer);
@@ skipping 33 matching lines @@
 }
 
 TEST_F(BridgedSyncNotifierTest, SendNotification) {
   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