| Index: sync/internal_api/syncapi_unittest.cc
|
| diff --git a/sync/internal_api/syncapi_unittest.cc b/sync/internal_api/syncapi_unittest.cc
|
| index f5eb675e17e30bf054dab6918b9fadbfac026a06..ba1388297e58f5d8027781c475d3dff02e569cd0 100644
|
| --- a/sync/internal_api/syncapi_unittest.cc
|
| +++ b/sync/internal_api/syncapi_unittest.cc
|
| @@ -676,8 +676,9 @@ class SyncManagerObserverMock : public SyncManager::Observer {
|
| public:
|
| MOCK_METHOD1(OnSyncCycleCompleted,
|
| void(const SyncSessionSnapshot&)); // NOLINT
|
| - MOCK_METHOD2(OnInitializationComplete,
|
| - void(const WeakHandle<JsBackend>&, bool)); // NOLINT
|
| + MOCK_METHOD3(OnInitializationComplete,
|
| + void(const WeakHandle<JsBackend>&, bool,
|
| + syncer::ModelTypeSet)); // NOLINT
|
| MOCK_METHOD1(OnConnectionStatusChange, void(ConnectionStatus)); // NOLINT
|
| MOCK_METHOD2(OnPassphraseRequired,
|
| void(PassphraseRequiredReason,
|
| @@ -754,7 +755,7 @@ class SyncManagerTest : public testing::Test,
|
| WillOnce(Invoke(this, &SyncManagerTest::SyncNotifierRemoveObserver));
|
|
|
| sync_manager_.AddObserver(&observer_);
|
| - EXPECT_CALL(observer_, OnInitializationComplete(_, _)).
|
| + EXPECT_CALL(observer_, OnInitializationComplete(_, _, _)).
|
| WillOnce(SaveArg<0>(&js_backend_));
|
|
|
| EXPECT_FALSE(sync_notifier_observer_);
|
| @@ -771,8 +772,7 @@ class SyncManagerTest : public testing::Test,
|
| base::MessageLoopProxy::current(),
|
| scoped_ptr<HttpPostProviderFactory>(
|
| new TestHttpPostProviderFactory()),
|
| - routing_info, workers,
|
| - &extensions_activity_monitor_, this,
|
| + workers, &extensions_activity_monitor_, this,
|
| credentials,
|
| scoped_ptr<SyncNotifier>(sync_notifier_mock_),
|
| "",
|
|
|