Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: components/sync/core/model_type_store_impl.cc

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/sync/core/model_type_store_impl.cc
diff --git a/components/sync/core/model_type_store_impl.cc b/components/sync/core/model_type_store_impl.cc
index e2993822db979560cb6432a561677eae3770ab15..03348cd7964247acee80dfe4c7b86ff118747445 100644
--- a/components/sync/core/model_type_store_impl.cc
+++ b/components/sync/core/model_type_store_impl.cc
@@ -17,7 +17,7 @@
#include "third_party/leveldatabase/src/include/leveldb/env.h"
#include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
-namespace syncer_v2 {
+namespace syncer {
namespace {
@@ -35,13 +35,13 @@ void NoOpForBackendDtor(scoped_refptr<ModelTypeStoreBackend> backend) {
} // namespace
// static
-std::string ModelTypeStoreImpl::FormatDataPrefix(const syncer::ModelType type) {
- return std::string(syncer::GetModelTypeRootTag(type)) + kDataPrefix;
+std::string ModelTypeStoreImpl::FormatDataPrefix(const ModelType type) {
+ return std::string(GetModelTypeRootTag(type)) + kDataPrefix;
}
// static
-std::string ModelTypeStoreImpl::FormatMetaPrefix(const syncer::ModelType type) {
- return std::string(syncer::GetModelTypeRootTag(type)) + kMetadataPrefix;
+std::string ModelTypeStoreImpl::FormatMetaPrefix(const ModelType type) {
+ return std::string(GetModelTypeRootTag(type)) + kMetadataPrefix;
}
// static
@@ -59,7 +59,7 @@ std::string ModelTypeStoreImpl::FormatMetadataKey(const std::string& id) {
}
ModelTypeStoreImpl::ModelTypeStoreImpl(
- const syncer::ModelType type,
+ const ModelType type,
scoped_refptr<ModelTypeStoreBackend> backend,
scoped_refptr<base::SequencedTaskRunner> backend_task_runner)
: backend_(backend),
@@ -79,7 +79,7 @@ ModelTypeStoreImpl::~ModelTypeStoreImpl() {
// static
void ModelTypeStoreImpl::CreateStore(
- const syncer::ModelType type,
+ const ModelType type,
const std::string& path,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
const InitCallback& callback) {
@@ -116,16 +116,15 @@ void ModelTypeStoreImpl::CreateInMemoryStoreForTest(
auto task = base::Bind(&ModelTypeStoreBackend::GetOrCreateBackend, path,
base::Passed(&env), result.get());
- auto reply =
- base::Bind(&ModelTypeStoreImpl::BackendInitDone, syncer::UNSPECIFIED,
- base::Passed(&result), task_runner, callback);
+ auto reply = base::Bind(&ModelTypeStoreImpl::BackendInitDone, UNSPECIFIED,
+ base::Passed(&result), task_runner, callback);
base::PostTaskAndReplyWithResult(task_runner.get(), FROM_HERE, task, reply);
}
// static
void ModelTypeStoreImpl::BackendInitDone(
- const syncer::ModelType type,
+ const ModelType type,
std::unique_ptr<Result> result,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
const InitCallback& callback,
@@ -341,4 +340,4 @@ ModelTypeStoreImpl::WriteBatchImpl::WriteBatchImpl() {
ModelTypeStoreImpl::WriteBatchImpl::~WriteBatchImpl() {}
-} // namespace syncer_v2
+} // namespace syncer
« no previous file with comments | « components/sync/core/model_type_store_impl.h ('k') | components/sync/core/model_type_store_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698