| Index: components/sync/sessions/sync_session_snapshot.h
 | 
| diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.h b/components/sync/sessions/sync_session_snapshot.h
 | 
| similarity index 85%
 | 
| rename from sync/internal_api/public/sessions/sync_session_snapshot.h
 | 
| rename to components/sync/sessions/sync_session_snapshot.h
 | 
| index d419377bd19a03f29845fd0f401b25a20edfbb65..9ff4d7cb905a66b7c22d0a189eba7072a5e66cb4 100644
 | 
| --- a/sync/internal_api/public/sessions/sync_session_snapshot.h
 | 
| +++ b/components/sync/sessions/sync_session_snapshot.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_INTERNAL_API_PUBLIC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_
 | 
| -#define SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_
 | 
| +#ifndef COMPONENTS_SYNC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_
 | 
| +#define COMPONENTS_SYNC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_
 | 
|  
 | 
|  #include <stddef.h>
 | 
|  
 | 
| @@ -11,10 +11,10 @@
 | 
|  #include <vector>
 | 
|  
 | 
|  #include "base/time/time.h"
 | 
| -#include "sync/base/sync_export.h"
 | 
| -#include "sync/internal_api/public/base/model_type.h"
 | 
| -#include "sync/internal_api/public/base/progress_marker_map.h"
 | 
| -#include "sync/internal_api/public/sessions/model_neutral_state.h"
 | 
| +#include "components/sync/base/model_type.h"
 | 
| +#include "components/sync/base/progress_marker_map.h"
 | 
| +#include "components/sync/base/sync_export.h"
 | 
| +#include "components/sync/sessions/model_neutral_state.h"
 | 
|  
 | 
|  namespace base {
 | 
|  class DictionaryValue;
 | 
| @@ -52,9 +52,7 @@ class SYNC_EXPORT SyncSessionSnapshot {
 | 
|  
 | 
|    std::string ToString() const;
 | 
|  
 | 
| -  ModelNeutralState model_neutral_state() const {
 | 
| -    return model_neutral_state_;
 | 
| -  }
 | 
| +  ModelNeutralState model_neutral_state() const { return model_neutral_state_; }
 | 
|    const ProgressMarkerMap& download_progress_markers() const;
 | 
|    bool is_silenced() const;
 | 
|    int num_encryption_conflicts() const;
 | 
| @@ -97,4 +95,4 @@ class SYNC_EXPORT SyncSessionSnapshot {
 | 
|  }  // namespace sessions
 | 
|  }  // namespace syncer
 | 
|  
 | 
| -#endif  // SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_
 | 
| +#endif  // COMPONENTS_SYNC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_
 | 
| 
 |