| Index: components/sync/test/engine/mock_model_type_processor.cc
|
| diff --git a/sync/test/engine/mock_model_type_processor.cc b/components/sync/test/engine/mock_model_type_processor.cc
|
| similarity index 94%
|
| rename from sync/test/engine/mock_model_type_processor.cc
|
| rename to components/sync/test/engine/mock_model_type_processor.cc
|
| index e6d27015993623eb7f04a8e07f94662e38d33a9e..d2bea02400d228ed7b5b4bd921e832c4f91ca425 100644
|
| --- a/sync/test/engine/mock_model_type_processor.cc
|
| +++ b/components/sync/test/engine/mock_model_type_processor.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/test/engine/mock_model_type_processor.h"
|
| +#include "components/sync/test/engine/mock_model_type_processor.h"
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| @@ -10,7 +10,7 @@
|
| #include "base/base64.h"
|
| #include "base/bind.h"
|
| #include "base/sha1.h"
|
| -#include "sync/engine/commit_queue.h"
|
| +#include "components/sync/engine_impl/commit_queue.h"
|
|
|
| namespace syncer_v2 {
|
|
|
| @@ -34,9 +34,7 @@ void MockModelTypeProcessor::OnCommitCompleted(
|
| const CommitResponseDataList& response_list) {
|
| base::Closure task =
|
| base::Bind(&MockModelTypeProcessor::OnCommitCompletedImpl,
|
| - base::Unretained(this),
|
| - type_state,
|
| - response_list);
|
| + base::Unretained(this), type_state, response_list);
|
| pending_tasks_.push_back(task);
|
| if (is_synchronous_)
|
| RunQueuedTasks();
|
| @@ -45,10 +43,9 @@ void MockModelTypeProcessor::OnCommitCompleted(
|
| void MockModelTypeProcessor::OnUpdateReceived(
|
| const sync_pb::DataTypeState& type_state,
|
| const UpdateResponseDataList& response_list) {
|
| - base::Closure task = base::Bind(&MockModelTypeProcessor::OnUpdateReceivedImpl,
|
| - base::Unretained(this),
|
| - type_state,
|
| - response_list);
|
| + base::Closure task =
|
| + base::Bind(&MockModelTypeProcessor::OnUpdateReceivedImpl,
|
| + base::Unretained(this), type_state, response_list);
|
| pending_tasks_.push_back(task);
|
| if (is_synchronous_)
|
| RunQueuedTasks();
|
| @@ -60,8 +57,7 @@ void MockModelTypeProcessor::SetSynchronousExecution(bool is_synchronous) {
|
|
|
| void MockModelTypeProcessor::RunQueuedTasks() {
|
| for (std::vector<base::Closure>::iterator it = pending_tasks_.begin();
|
| - it != pending_tasks_.end();
|
| - ++it) {
|
| + it != pending_tasks_.end(); ++it) {
|
| it->Run();
|
| }
|
| pending_tasks_.clear();
|
|
|