Move some sync/notifier to components/invalidation

components/invalidation/gcm_network_channel.h

Index: components/invalidation/gcm_network_channel.h
diff --git a/sync/notifier/gcm_network_channel.h b/components/invalidation/gcm_network_channel.h
similarity index 91%
rename from sync/notifier/gcm_network_channel.h
rename to components/invalidation/gcm_network_channel.h
index 5f86ce768d35e70af24e788f552c3be3642acaed..e9a513125ead55ff86698c2047ee4ca5af8a7db4 100644
--- a/sync/notifier/gcm_network_channel.h
+++ b/components/invalidation/gcm_network_channel.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_H_
-#define SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_H_
+#ifndef COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_
+#define COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_
 
 #include <string>
 
@@ -11,12 +11,12 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
+#include "components/invalidation/gcm_network_channel_delegate.h"
+#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/sync_system_resources.h"
 #include "net/base/backoff_entry.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_fetcher_delegate.h"
-#include "sync/base/sync_export.h"
-#include "sync/notifier/gcm_network_channel_delegate.h"
-#include "sync/notifier/sync_system_resources.h"
 #include "url/gurl.h"
 
 class GoogleServiceAuthError;
@@ -46,7 +46,7 @@ struct GCMNetworkChannelDiagnostic {
 
 // GCMNetworkChannel is an implementation of SyncNetworkChannel that routes
 // messages through GCMService.
-class SYNC_EXPORT_PRIVATE GCMNetworkChannel
+class INVALIDATION_EXPORT_PRIVATE GCMNetworkChannel
     : public SyncNetworkChannel,
       public net::URLFetcherDelegate,
       public net::NetworkChangeNotifier::NetworkChangeObserver,
@@ -132,4 +132,4 @@ class SYNC_EXPORT_PRIVATE GCMNetworkChannel
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_H_
+#endif  // COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_