| Index: components/sync/engine/cycle/model_neutral_state.h
|
| diff --git a/components/sync/sessions/model_neutral_state.h b/components/sync/engine/cycle/model_neutral_state.h
|
| similarity index 89%
|
| rename from components/sync/sessions/model_neutral_state.h
|
| rename to components/sync/engine/cycle/model_neutral_state.h
|
| index 660948d8406522662c89c52e8f2833ecb3ed49bd..2a7faba98a21a18bfce5bf023e725b4e20c29cf1 100644
|
| --- a/components/sync/sessions/model_neutral_state.h
|
| +++ b/components/sync/engine/cycle/model_neutral_state.h
|
| @@ -2,15 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef COMPONENTS_SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H_
|
| -#define COMPONENTS_SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H_
|
| +#ifndef COMPONENTS_SYNC_ENGINE_CYCLE_MODEL_NEUTRAL_STATE_H_
|
| +#define COMPONENTS_SYNC_ENGINE_CYCLE_MODEL_NEUTRAL_STATE_H_
|
|
|
| #include "components/sync/base/model_type.h"
|
| #include "components/sync/base/syncer_error.h"
|
| #include "components/sync/protocol/sync.pb.h"
|
|
|
| namespace syncer {
|
| -namespace sessions {
|
|
|
| // Grouping of all state that applies to all model types. Note that some
|
| // components of the global grouping can internally implement finer grained
|
| @@ -59,7 +58,6 @@ struct ModelNeutralState {
|
|
|
| bool HasSyncerError(const ModelNeutralState& state);
|
|
|
| -} // namespace sessions
|
| } // namespace syncer
|
|
|
| -#endif // COMPONENTS_SYNC_SESSIONS_MODEL_NEUTRAL_STATE_H_
|
| +#endif // COMPONENTS_SYNC_ENGINE_CYCLE_MODEL_NEUTRAL_STATE_H_
|
|
|