Retry: Move some sync/notifier to components/invalidation

components/invalidation/non_blocking_invalidator.cc

 // Copyright 2014 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 "sync/notifier/non_blocking_invalidator.h"
+#include "components/invalidation/non_blocking_invalidator.h"
 
 #include <cstddef>
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
+#include "components/invalidation/gcm_network_channel_delegate.h"
+#include "components/invalidation/invalidation_notifier.h"
+#include "components/invalidation/sync_system_resources.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "sync/internal_api/public/util/weak_handle.h"
-#include "sync/notifier/gcm_network_channel_delegate.h"
 #include "sync/notifier/invalidation_handler.h"
-#include "sync/notifier/invalidation_notifier.h"
 #include "sync/notifier/object_id_invalidation_map.h"
-#include "sync/notifier/sync_system_resources.h"
 
 namespace syncer {
 
 struct NonBlockingInvalidator::InitializeOptions {
   InitializeOptions(
       NetworkChannelCreator network_channel_creator,
       const std::string& invalidator_client_id,
       const UnackedInvalidationsMap& saved_invalidations,
       const std::string& invalidation_bootstrap_data,
       const WeakHandle<InvalidationStateTracker>&
@@ skipping 326 matching lines @@
 
 void NonBlockingInvalidator::OnIncomingInvalidation(
         const ObjectIdInvalidationMap& invalidation_map) {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
   registrar_.DispatchInvalidationsToHandlers(invalidation_map);
 }
 
 std::string NonBlockingInvalidator::GetOwnerName() const { return "Sync"; }
 
 }  // namespace syncer