| Index: components/sync/api/sync_data.h
|
| diff --git a/sync/api/sync_data.h b/components/sync/api/sync_data.h
|
| similarity index 88%
|
| rename from sync/api/sync_data.h
|
| rename to components/sync/api/sync_data.h
|
| index c0e2f8bb68570239364363bc41c0b243fde8d5ac..adc205b57afb484d09aa803f9549817f09c5ecc2 100644
|
| --- a/sync/api/sync_data.h
|
| +++ b/components/sync/api/sync_data.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_API_SYNC_DATA_H_
|
| -#define SYNC_API_SYNC_DATA_H_
|
| +#ifndef COMPONENTS_SYNC_API_SYNC_DATA_H_
|
| +#define COMPONENTS_SYNC_API_SYNC_DATA_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -15,12 +15,12 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/stl_util.h"
|
| #include "base/time/time.h"
|
| -#include "sync/api/attachments/attachment_id.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/attachments/attachment_service_proxy.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/util/immutable.h"
|
| -#include "sync/internal_api/public/util/weak_handle.h"
|
| +#include "components/sync/api/attachments/attachment_id.h"
|
| +#include "components/sync/base/immutable.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/base/weak_handle.h"
|
| +#include "components/sync/core/attachments/attachment_service_proxy.h"
|
|
|
| namespace sync_pb {
|
| class EntitySpecifics;
|
| @@ -58,13 +58,11 @@ class SYNC_EXPORT SyncData {
|
| // encrypted.
|
| //
|
| // For data with attachments: |attachment_ids| must not contain duplicates.
|
| - static SyncData CreateLocalDelete(
|
| - const std::string& sync_tag,
|
| - ModelType datatype);
|
| - static SyncData CreateLocalData(
|
| - const std::string& sync_tag,
|
| - const std::string& non_unique_title,
|
| - const sync_pb::EntitySpecifics& specifics);
|
| + static SyncData CreateLocalDelete(const std::string& sync_tag,
|
| + ModelType datatype);
|
| + static SyncData CreateLocalData(const std::string& sync_tag,
|
| + const std::string& non_unique_title,
|
| + const sync_pb::EntitySpecifics& specifics);
|
| static SyncData CreateLocalDataWithAttachments(
|
| const std::string& sync_tag,
|
| const std::string& non_unique_title,
|
| @@ -206,4 +204,4 @@ typedef std::vector<SyncData> SyncDataList;
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_API_SYNC_DATA_H_
|
| +#endif // COMPONENTS_SYNC_API_SYNC_DATA_H_
|
|
|