Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Unified Diff: sync/internal_api/syncapi_unittest.cc

Issue 10520010: Not for review: Support sync init with missing or corrupt store (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Documentation Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/internal_api/syncapi_unittest.cc
diff --git a/sync/internal_api/syncapi_unittest.cc b/sync/internal_api/syncapi_unittest.cc
index 5c706185acc7525e6825d8ee3d95d9be4c8c9cba..4355247b227db04bb5324910b52fca8322b9cc8b 100644
--- a/sync/internal_api/syncapi_unittest.cc
+++ b/sync/internal_api/syncapi_unittest.cc
@@ -688,8 +688,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,
+ syncable::ModelTypeSet)); // NOLINT
MOCK_METHOD1(OnConnectionStatusChange, void(ConnectionStatus)); // NOLINT
MOCK_METHOD2(OnPassphraseRequired,
void(sync_api::PassphraseRequiredReason,
@@ -768,7 +769,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_);
@@ -783,7 +784,7 @@ class SyncManagerTest : public testing::Test,
WeakHandle<JsEventHandler>(),
"bogus", 0, false,
base::MessageLoopProxy::current(),
- new TestHttpPostProviderFactory(), routing_info, workers,
+ new TestHttpPostProviderFactory(), workers,
&extensions_activity_monitor_, this, "bogus",
credentials,
sync_notifier_mock_, "",

Powered by Google App Engine
This is Rietveld 408576698