| Index: components/sync/engine_impl/all_status.cc
|
| diff --git a/sync/engine/all_status.cc b/components/sync/engine_impl/all_status.cc
|
| similarity index 94%
|
| rename from sync/engine/all_status.cc
|
| rename to components/sync/engine_impl/all_status.cc
|
| index 10b54e0ff241c6987ea3593e1cb7f2d605fce94b..9628a89058b8f3d6cc3e4b636c23df9207fe324f 100644
|
| --- a/sync/engine/all_status.cc
|
| +++ b/components/sync/engine_impl/all_status.cc
|
| @@ -2,14 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/engine/all_status.h"
|
| +#include "components/sync/engine_impl/all_status.h"
|
|
|
| #include <algorithm>
|
|
|
| #include "base/logging.h"
|
| -#include "sync/engine/net/server_connection_manager.h"
|
| -#include "sync/engine/sync_cycle_event.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/engine_impl/net/server_connection_manager.h"
|
| +#include "components/sync/engine_impl/sync_cycle_event.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -19,8 +19,7 @@ AllStatus::AllStatus() {
|
| status_.crypto_has_pending_keys = false;
|
| }
|
|
|
| -AllStatus::~AllStatus() {
|
| -}
|
| +AllStatus::~AllStatus() {}
|
|
|
| SyncStatus AllStatus::CreateBlankStatus() const {
|
| // Status is initialized with the previous status value. Variables
|
| @@ -34,7 +33,7 @@ SyncStatus AllStatus::CreateBlankStatus() const {
|
| return status;
|
| }
|
|
|
| -SyncStatus AllStatus::CalcSyncing(const SyncCycleEvent &event) const {
|
| +SyncStatus AllStatus::CalcSyncing(const SyncCycleEvent& event) const {
|
| SyncStatus status = CreateBlankStatus();
|
| const sessions::SyncSessionSnapshot& snapshot = event.snapshot;
|
| status.encryption_conflicts = snapshot.num_encryption_conflicts();
|
|
|