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

Unified Diff: chrome/browser/sync/test/integration/two_client_uss_sync_test.cc

Issue 2623723002: [Sync] Remove ModelError::IsSet() in favor of base::Optional. (Closed)
Patch Set: Rebase. 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: chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc b/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
index f9e97a14e28967a793310800fb1f91197838af22..dbba60daea130ba8d9b3d15c186cd3acc94d8a31 100644
--- a/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
@@ -4,6 +4,7 @@
#include "base/macros.h"
#include "base/memory/ptr_util.h"
+#include "base/optional.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/sync/chrome_sync_client.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
@@ -67,10 +68,10 @@ class TestModelTypeSyncBridge : public FakeModelTypeSyncBridge {
change_processor()->OnMetadataLoaded(db().CreateMetadataBatch());
}
- syncer::ModelError ApplySyncChanges(
+ base::Optional<syncer::ModelError> ApplySyncChanges(
std::unique_ptr<syncer::MetadataChangeList> metadata_changes,
syncer::EntityChangeList entity_changes) override {
- syncer::ModelError error = FakeModelTypeSyncBridge::ApplySyncChanges(
+ auto error = FakeModelTypeSyncBridge::ApplySyncChanges(
std::move(metadata_changes), entity_changes);
NotifyObservers();
return error;

Powered by Google App Engine
This is Rietveld 408576698