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

Unified Diff: components/sync/core/shared_model_type_processor_unittest.cc

Issue 2289143003: [Sync] Convert DTCs to be not RefCounted and NonThreadSafe. (Closed)
Patch Set: Rebase. Created 4 years, 3 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/core/shared_model_type_processor_unittest.cc
diff --git a/components/sync/core/shared_model_type_processor_unittest.cc b/components/sync/core/shared_model_type_processor_unittest.cc
index 7d7337cbd94f50398c45c8255d874179b35412b1..8108cb08126a58c3013622142c44b7449204b877 100644
--- a/components/sync/core/shared_model_type_processor_unittest.cc
+++ b/components/sync/core/shared_model_type_processor_unittest.cc
@@ -8,6 +8,7 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <utility>
#include <vector>
@@ -16,12 +17,12 @@
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "components/sync/api/data_type_error_handler_mock.h"
#include "components/sync/api/fake_model_type_service.h"
#include "components/sync/base/model_type.h"
#include "components/sync/base/time.h"
#include "components/sync/core/activation_context.h"
#include "components/sync/core/simple_metadata_change_list.h"
-#include "components/sync/core/test/data_type_error_handler_mock.h"
#include "components/sync/engine/commit_queue.h"
#include "components/sync/protocol/sync.pb.h"
#include "components/sync/test/engine/mock_model_type_worker.h"
@@ -111,8 +112,11 @@ class SharedModelTypeProcessorTest : public ::testing::Test,
}
void OnSyncStarting() {
+ std::unique_ptr<syncer::DataTypeErrorHandlerMock> error_handler =
+ base::MakeUnique<syncer::DataTypeErrorHandlerMock>();
+ error_handler_ = error_handler.get();
type_processor()->OnSyncStarting(
- &error_handler_,
+ std::move(error_handler),
base::Bind(&SharedModelTypeProcessorTest::OnReadyToConnect,
base::Unretained(this)));
}
@@ -210,7 +214,10 @@ class SharedModelTypeProcessorTest : public ::testing::Test,
return static_cast<SharedModelTypeProcessor*>(change_processor());
}
- syncer::DataTypeErrorHandlerMock* error_handler() { return &error_handler_; }
+ syncer::DataTypeErrorHandlerMock* error_handler() {
+ DCHECK(error_handler_);
+ return error_handler_;
+ }
private:
void CheckPostConditions() override {
@@ -273,7 +280,7 @@ class SharedModelTypeProcessorTest : public ::testing::Test,
base::Closure data_callback_;
// The processor's error handler.
- syncer::DataTypeErrorHandlerMock error_handler_;
+ syncer::DataTypeErrorHandlerMock* error_handler_;
// The error to expect in OnReadyToConnect().
syncer::SyncError::ErrorType expected_start_error_ = syncer::SyncError::UNSET;
« no previous file with comments | « components/sync/core/shared_model_type_processor.cc ('k') | components/sync/core/test/data_type_error_handler_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698