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

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

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 5 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
« no previous file with comments | « components/sync/core/delete_journal.h ('k') | components/sync/core/http_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/core/delete_journal.cc
diff --git a/sync/internal_api/delete_journal.cc b/components/sync/core/delete_journal.cc
similarity index 76%
rename from sync/internal_api/delete_journal.cc
rename to components/sync/core/delete_journal.cc
index 6b8d955b2bf908d64f3297160e2f7060d25574bc..10f0e3ff238bf1a3f108eaae2a4179b543c7ff96 100644
--- a/sync/internal_api/delete_journal.cc
+++ b/components/sync/core/delete_journal.cc
@@ -2,41 +2,43 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sync/internal_api/public/delete_journal.h"
+#include "components/sync/core/delete_journal.h"
#include <stdint.h>
#include <set>
#include <string>
-#include "sync/internal_api/public/base_transaction.h"
-#include "sync/syncable/directory.h"
-#include "sync/syncable/syncable_base_transaction.h"
+#include "components/sync/core/base_transaction.h"
+#include "components/sync/syncable/directory.h"
+#include "components/sync/syncable/syncable_base_transaction.h"
namespace syncer {
// static
void DeleteJournal::GetBookmarkDeleteJournals(
- BaseTransaction* trans, BookmarkDeleteJournalList *delete_journal_list) {
+ BaseTransaction* trans,
+ BookmarkDeleteJournalList* delete_journal_list) {
syncer::syncable::EntryKernelSet deleted_entries;
trans->GetDirectory()->delete_journal()->GetDeleteJournals(
trans->GetWrappedTrans(), BOOKMARKS, &deleted_entries);
std::set<int64_t> undecryptable_journal;
for (syncer::syncable::EntryKernelSet::const_iterator i =
- deleted_entries.begin(); i != deleted_entries.end(); ++i) {
+ deleted_entries.begin();
+ i != deleted_entries.end(); ++i) {
delete_journal_list->push_back(BookmarkDeleteJournal());
delete_journal_list->back().id = (*i)->ref(syncer::syncable::META_HANDLE);
delete_journal_list->back().external_id =
(*i)->ref(syncer::syncable::LOCAL_EXTERNAL_ID);
delete_journal_list->back().is_folder = (*i)->ref(syncer::syncable::IS_DIR);
- const sync_pb::EntitySpecifics& specifics = (*i)->ref(
- syncer::syncable::SPECIFICS);
+ const sync_pb::EntitySpecifics& specifics =
+ (*i)->ref(syncer::syncable::SPECIFICS);
if (!specifics.has_encrypted()) {
delete_journal_list->back().specifics = specifics;
} else {
- std::string plaintext_data = trans->GetCryptographer()->DecryptToString(
- specifics.encrypted());
+ std::string plaintext_data =
+ trans->GetCryptographer()->DecryptToString(specifics.encrypted());
sync_pb::EntitySpecifics unencrypted_data;
if (plaintext_data.length() == 0 ||
!unencrypted_data.ParseFromString(plaintext_data)) {
« no previous file with comments | « components/sync/core/delete_journal.h ('k') | components/sync/core/http_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698