| Index: components/sync/syncable/directory_backing_store.h
|
| diff --git a/sync/syncable/directory_backing_store.h b/components/sync/syncable/directory_backing_store.h
|
| similarity index 92%
|
| rename from sync/syncable/directory_backing_store.h
|
| rename to components/sync/syncable/directory_backing_store.h
|
| index a2c8d9cc80bcfa7d92f13cf9e24ec92572173b2a..1dd16ee4dd9b8711c3079698931bcd1f22dbe769 100644
|
| --- a/sync/syncable/directory_backing_store.h
|
| +++ b/components/sync/syncable/directory_backing_store.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_SYNCABLE_DIRECTORY_BACKING_STORE_H_
|
| -#define SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
|
| +#ifndef COMPONENTS_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
|
| +#define COMPONENTS_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -13,13 +13,13 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| #include "base/threading/non_thread_safe.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/syncable/dir_open_result.h"
|
| +#include "components/sync/syncable/directory.h"
|
| +#include "components/sync/syncable/metahandle_set.h"
|
| #include "sql/connection.h"
|
| #include "sql/statement.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/syncable/dir_open_result.h"
|
| -#include "sync/syncable/directory.h"
|
| -#include "sync/syncable/metahandle_set.h"
|
|
|
| namespace sync_pb {
|
| class EntitySpecifics;
|
| @@ -229,12 +229,12 @@ class SYNC_EXPORT DirectoryBackingStore : public base::NonThreadSafe {
|
| bool CreateV81ModelsTable();
|
|
|
| // Returns true on success, false on error.
|
| - bool MigrateToSpecifics(const char* old_columns,
|
| - const char* specifics_column,
|
| - void(*handler_function) (
|
| - sql::Statement* old_value_query,
|
| - int old_value_column,
|
| - sync_pb::EntitySpecifics* mutable_new_value));
|
| + bool MigrateToSpecifics(
|
| + const char* old_columns,
|
| + const char* specifics_column,
|
| + void (*handler_function)(sql::Statement* old_value_query,
|
| + int old_value_column,
|
| + sync_pb::EntitySpecifics* mutable_new_value));
|
|
|
| // Returns true on success, false on error.
|
| bool Vacuum();
|
| @@ -268,4 +268,4 @@ class SYNC_EXPORT DirectoryBackingStore : public base::NonThreadSafe {
|
| } // namespace syncable
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
|
| +#endif // COMPONENTS_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
|
|
|