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

Unified Diff: components/sync/model/model_type_sync_bridge_unittest.cc

Issue 2620773002: [Sync] Use ModelError all the way through to ModelTypeController. (Closed)
Patch Set: const& everything and use a typedef. Created 3 years, 11 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: components/sync/model/model_type_sync_bridge_unittest.cc
diff --git a/components/sync/model/model_type_sync_bridge_unittest.cc b/components/sync/model/model_type_sync_bridge_unittest.cc
index 030bee806c73f11ea4b0dfe73c4582e75288fca4..51dd4c05c7ad677e7af459cfcf629a956f75f7e4 100644
--- a/components/sync/model/model_type_sync_bridge_unittest.cc
+++ b/components/sync/model/model_type_sync_bridge_unittest.cc
@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/memory/ptr_util.h"
-#include "components/sync/model/data_type_error_handler_mock.h"
#include "components/sync/model/fake_model_type_change_processor.h"
#include "components/sync/model/metadata_batch.h"
#include "components/sync/model/stub_model_type_sync_bridge.h"
@@ -84,7 +83,7 @@ class ModelTypeSyncBridgeTest : public ::testing::Test {
void OnSyncStarting() {
bridge_.OnSyncStarting(
- base::MakeUnique<DataTypeErrorHandlerMock>(),
+ ModelErrorHandler(),
base::Bind(&ModelTypeSyncBridgeTest::OnProcessorStarted,
base::Unretained(this)));
}
@@ -94,7 +93,6 @@ class ModelTypeSyncBridgeTest : public ::testing::Test {
private:
void OnProcessorStarted(
- SyncError error,
std::unique_ptr<ActivationContext> activation_context) {
start_callback_called_ = true;
}
« no previous file with comments | « components/sync/model/model_type_sync_bridge.cc ('k') | components/sync/model_impl/shared_model_type_processor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698