Retry: Move some sync/notifier to components/invalidation

components/invalidation/p2p_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/p2p_invalidator.h"
+#include "components/invalidation/p2p_invalidator.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/values.h"
+#include "components/invalidation/notifier_reason_util.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "sync/notifier/invalidation_handler.h"
 #include "sync/notifier/invalidation_util.h"
 #include "sync/notifier/object_id_invalidation_map.h"
 
 namespace syncer {
 
 const char kSyncP2PNotificationChannel[] = "http://www.google.com/chrome/sync";
 
 namespace {
@@ skipping 266 matching lines @@
     return;
   }
   notifier::Notification notification;
   notification.channel = kSyncP2PNotificationChannel;
   notification.data = notification_data.ToString();
   DVLOG(1) << "Sending XMPP notification: " << notification.ToString();
   push_client_->SendNotification(notification);
 }
 
 }  // namespace syncer