Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

components/sync/tools/sync_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include <cstddef>
 #include <cstdio>
 #include <memory>
 #include <string>
@@ skipping 172 matching lines @@
       public base::SupportsWeakPtr<LoggingJsEventHandler> {
  public:
   ~LoggingJsEventHandler() override {}
 
   void HandleJsEvent(const std::string& name,
                      const JsEventDetails& details) override {
     VLOG(1) << name << ": " << details.ToString();
   }
 };
 
-class InvalidationAdapter : public InvalidationInterface {
+class InvalidationAdapter : public syncer::InvalidationInterface {
  public:
-  explicit InvalidationAdapter(const Invalidation& invalidation)
+  explicit InvalidationAdapter(const syncer::Invalidation& invalidation)
       : invalidation_(invalidation) {}
   ~InvalidationAdapter() override {}
 
   bool IsUnknownVersion() const override {
     return invalidation_.is_unknown_version();
   }
 
   const std::string& GetPayload() const override {
     return invalidation_.payload();
   }
 
   int64_t GetVersion() const override { return invalidation_.version(); }
 
   void Acknowledge() override { invalidation_.Acknowledge(); }
 
   void Drop() override { invalidation_.Drop(); }
 
  private:
-  Invalidation invalidation_;
+  syncer::Invalidation invalidation_;
 };
 
 class InvalidatorShim : public InvalidationHandler {
  public:
   explicit InvalidatorShim(SyncManager* sync_manager)
       : sync_manager_(sync_manager) {}
 
   void OnInvalidatorStateChange(InvalidatorState state) override {
     sync_manager_->SetInvalidatorEnabled(state == INVALIDATIONS_ENABLED);
   }
 
   void OnIncomingInvalidation(
       const ObjectIdInvalidationMap& invalidation_map) override {
-    ObjectIdSet ids = invalidation_map.GetObjectIds();
-    for (ObjectIdSet::const_iterator ids_it = ids.begin(); ids_it != ids.end();
-         ++ids_it) {
-      ModelType type;
+    syncer::ObjectIdSet ids = invalidation_map.GetObjectIds();
+    for (syncer::ObjectIdSet::const_iterator ids_it = ids.begin();
+         ids_it != ids.end(); ++ids_it) {
+      syncer::ModelType type;
       if (!NotificationTypeToRealModelType(ids_it->name(), &type)) {
         DLOG(WARNING) << "Notification has invalid id: "
-                      << ObjectIdToString(*ids_it);
+                      << syncer::ObjectIdToString(*ids_it);
       } else {
-        SingleObjectInvalidationSet invalidation_set =
+        syncer::SingleObjectInvalidationSet invalidation_set =
             invalidation_map.ForObject(*ids_it);
-        for (SingleObjectInvalidationSet::const_iterator inv_it =
+        for (syncer::SingleObjectInvalidationSet::const_iterator inv_it =
                  invalidation_set.begin();
              inv_it != invalidation_set.end(); ++inv_it) {
-          std::unique_ptr<InvalidationInterface> inv_adapter(
+          std::unique_ptr<syncer::InvalidationInterface> inv_adapter(
               new InvalidationAdapter(*inv_it));
           sync_manager_->OnIncomingInvalidation(type, std::move(inv_adapter));
         }
       }
     }
   }
 
   std::string GetOwnerName() const override { return "InvalidatorShim"; }
 
  private:
@@ skipping 58 matching lines @@
   credentials.account_id = command_line.GetSwitchValueASCII(kEmailSwitch);
   credentials.email = command_line.GetSwitchValueASCII(kEmailSwitch);
   credentials.sync_token = command_line.GetSwitchValueASCII(kTokenSwitch);
   // TODO(akalin): Write a wrapper script that gets a token for an
   // email and password and passes that in to this utility.
   if (credentials.email.empty() || credentials.sync_token.empty()) {
     std::printf(
         "Usage: %s --%s=foo@bar.com --%s=token\n"
         "[--%s=host:port] [--%s] [--%s]\n"
         "Run chrome and set a breakpoint on\n"
-        "SyncManagerImpl::UpdateCredentials() "
+        "syncer::SyncManagerImpl::UpdateCredentials() "
         "after logging into\n"
         "sync to get the token to pass into this utility.\n",
         argv[0], kEmailSwitch, kTokenSwitch, kXmppHostPortSwitch,
         kXmppTrySslTcpFirstSwitch, kXmppAllowInsecureConnectionSwitch);
     return -1;
   }
 
   // Set up objects that monitor the network.
   std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
       net::NetworkChangeNotifier::Create());
 
   // Set up sync notifier factory.
   const scoped_refptr<MyTestURLRequestContextGetter> context_getter =
       new MyTestURLRequestContextGetter(io_thread.task_runner());
   const notifier::NotifierOptions& notifier_options =
       ParseNotifierOptions(command_line, context_getter);
-  NetworkChannelCreator network_channel_creator =
-      NonBlockingInvalidator::MakePushClientChannelCreator(notifier_options);
+  syncer::NetworkChannelCreator network_channel_creator =
+      syncer::NonBlockingInvalidator::MakePushClientChannelCreator(
+          notifier_options);
   const char kClientInfo[] = "standalone_sync_client";
   std::string invalidator_id = base::RandBytesAsString(8);
   NullInvalidationStateTracker null_invalidation_state_tracker;
   std::unique_ptr<Invalidator> invalidator(new NonBlockingInvalidator(
       network_channel_creator, invalidator_id,
       null_invalidation_state_tracker.GetSavedInvalidations(),
       null_invalidation_state_tracker.GetBootstrapData(),
       &null_invalidation_state_tracker, kClientInfo,
       notifier_options.request_context_getter));
 
@@ skipping 101 matching lines @@
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncClientMain(argc, argv);
 }