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

Unified Diff: components/sync/tools/sync_client.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/tools/sync_client.cc
diff --git a/components/sync/tools/sync_client.cc b/components/sync/tools/sync_client.cc
index 08a44743b613b4cf90d6ce1e61fbc3a230a35af8..0007e9501133e3b51ae97c0e5bbbe760b59cc967 100644
--- a/components/sync/tools/sync_client.cc
+++ b/components/sync/tools/sync_client.cc
@@ -190,9 +190,9 @@ class LoggingJsEventHandler
}
};
-class InvalidationAdapter : public syncer::InvalidationInterface {
+class InvalidationAdapter : public InvalidationInterface {
public:
- explicit InvalidationAdapter(const syncer::Invalidation& invalidation)
+ explicit InvalidationAdapter(const Invalidation& invalidation)
: invalidation_(invalidation) {}
~InvalidationAdapter() override {}
@@ -211,7 +211,7 @@ class InvalidationAdapter : public syncer::InvalidationInterface {
void Drop() override { invalidation_.Drop(); }
private:
- syncer::Invalidation invalidation_;
+ Invalidation invalidation_;
};
class InvalidatorShim : public InvalidationHandler {
@@ -225,20 +225,20 @@ class InvalidatorShim : public InvalidationHandler {
void OnIncomingInvalidation(
const ObjectIdInvalidationMap& invalidation_map) override {
- syncer::ObjectIdSet ids = invalidation_map.GetObjectIds();
- for (syncer::ObjectIdSet::const_iterator ids_it = ids.begin();
- ids_it != ids.end(); ++ids_it) {
- syncer::ModelType type;
+ ObjectIdSet ids = invalidation_map.GetObjectIds();
+ for (ObjectIdSet::const_iterator ids_it = ids.begin(); ids_it != ids.end();
+ ++ids_it) {
+ ModelType type;
if (!NotificationTypeToRealModelType(ids_it->name(), &type)) {
DLOG(WARNING) << "Notification has invalid id: "
- << syncer::ObjectIdToString(*ids_it);
+ << ObjectIdToString(*ids_it);
} else {
- syncer::SingleObjectInvalidationSet invalidation_set =
+ SingleObjectInvalidationSet invalidation_set =
invalidation_map.ForObject(*ids_it);
- for (syncer::SingleObjectInvalidationSet::const_iterator inv_it =
+ for (SingleObjectInvalidationSet::const_iterator inv_it =
invalidation_set.begin();
inv_it != invalidation_set.end(); ++inv_it) {
- std::unique_ptr<syncer::InvalidationInterface> inv_adapter(
+ std::unique_ptr<InvalidationInterface> inv_adapter(
new InvalidationAdapter(*inv_it));
sync_manager_->OnIncomingInvalidation(type, std::move(inv_adapter));
}
@@ -317,7 +317,7 @@ int SyncClientMain(int argc, char* argv[]) {
"Usage: %s --%s=foo@bar.com --%s=token\n"
"[--%s=host:port] [--%s] [--%s]\n"
"Run chrome and set a breakpoint on\n"
- "syncer::SyncManagerImpl::UpdateCredentials() "
+ "SyncManagerImpl::UpdateCredentials() "
"after logging into\n"
"sync to get the token to pass into this utility.\n",
argv[0], kEmailSwitch, kTokenSwitch, kXmppHostPortSwitch,
@@ -334,9 +334,8 @@ int SyncClientMain(int argc, char* argv[]) {
new MyTestURLRequestContextGetter(io_thread.task_runner());
const notifier::NotifierOptions& notifier_options =
ParseNotifierOptions(command_line, context_getter);
- syncer::NetworkChannelCreator network_channel_creator =
- syncer::NonBlockingInvalidator::MakePushClientChannelCreator(
- notifier_options);
+ NetworkChannelCreator network_channel_creator =
+ NonBlockingInvalidator::MakePushClientChannelCreator(notifier_options);
const char kClientInfo[] = "standalone_sync_client";
std::string invalidator_id = base::RandBytesAsString(8);
NullInvalidationStateTracker null_invalidation_state_tracker;
« no previous file with comments | « components/sync/test/fake_server/unique_client_entity.cc ('k') | components/sync/tools/sync_listen_notifications.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698