| Index: components/sync/engine_impl/sync_scheduler_impl.h
|
| diff --git a/sync/engine/sync_scheduler_impl.h b/components/sync/engine_impl/sync_scheduler_impl.h
|
| similarity index 92%
|
| rename from sync/engine/sync_scheduler_impl.h
|
| rename to components/sync/engine_impl/sync_scheduler_impl.h
|
| index f701ab8f95bbf555d7810aaf9b5bf34088929c80..7db93f166f476512e79268e1e40d547133910e59 100644
|
| --- a/sync/engine/sync_scheduler_impl.h
|
| +++ b/components/sync/engine_impl/sync_scheduler_impl.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_ENGINE_SYNC_SCHEDULER_IMPL_H_
|
| -#define SYNC_ENGINE_SYNC_SCHEDULER_IMPL_H_
|
| +#ifndef COMPONENTS_SYNC_ENGINE_IMPL_SYNC_SCHEDULER_IMPL_H_
|
| +#define COMPONENTS_SYNC_ENGINE_IMPL_SYNC_SCHEDULER_IMPL_H_
|
|
|
| #include <map>
|
| #include <memory>
|
| @@ -19,16 +19,16 @@
|
| #include "base/threading/non_thread_safe.h"
|
| #include "base/time/time.h"
|
| #include "base/timer/timer.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/engine/net/server_connection_manager.h"
|
| -#include "sync/engine/nudge_source.h"
|
| -#include "sync/engine/sync_scheduler.h"
|
| -#include "sync/engine/syncer.h"
|
| -#include "sync/internal_api/public/engine/polling_constants.h"
|
| -#include "sync/internal_api/public/util/weak_handle.h"
|
| -#include "sync/sessions/nudge_tracker.h"
|
| -#include "sync/sessions/sync_session.h"
|
| -#include "sync/sessions/sync_session_context.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/base/weak_handle.h"
|
| +#include "components/sync/engine/polling_constants.h"
|
| +#include "components/sync/engine_impl/net/server_connection_manager.h"
|
| +#include "components/sync/engine_impl/nudge_source.h"
|
| +#include "components/sync/engine_impl/sync_scheduler.h"
|
| +#include "components/sync/engine_impl/syncer.h"
|
| +#include "components/sync/sessions_impl/nudge_tracker.h"
|
| +#include "components/sync/sessions_impl/sync_session.h"
|
| +#include "components/sync/sessions_impl/sync_session_context.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -158,8 +158,7 @@ class SYNC_EXPORT SyncSchedulerImpl : public SyncScheduler,
|
| void HandleSuccess();
|
|
|
| // Helper function for Do{Nudge,Configuration,Poll}SyncSessionJob.
|
| - void HandleFailure(
|
| - const sessions::ModelNeutralState& model_neutral_state);
|
| + void HandleFailure(const sessions::ModelNeutralState& model_neutral_state);
|
|
|
| // Invoke the Syncer to perform a poll job.
|
| void DoPollSyncSessionJob();
|
| @@ -184,9 +183,8 @@ class SYNC_EXPORT SyncSchedulerImpl : public SyncScheduler,
|
| // on the passed in parameters and coalesce it with any other pending jobs,
|
| // then post a delayed task to run it. It may also choose to drop the job or
|
| // save it for later, depending on the scheduler's current state.
|
| - void ScheduleNudgeImpl(
|
| - const base::TimeDelta& delay,
|
| - const tracked_objects::Location& nudge_location);
|
| + void ScheduleNudgeImpl(const base::TimeDelta& delay,
|
| + const tracked_objects::Location& nudge_location);
|
|
|
| // Helper to signal listeners about changed retry time.
|
| void NotifyRetryTime(base::Time retry_time);
|
| @@ -328,4 +326,4 @@ class SYNC_EXPORT SyncSchedulerImpl : public SyncScheduler,
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_ENGINE_SYNC_SCHEDULER_IMPL_H_
|
| +#endif // COMPONENTS_SYNC_ENGINE_IMPL_SYNC_SCHEDULER_IMPL_H_
|
|
|