Retry: Move some sync/notifier to components/invalidation

components/invalidation/gcm_network_channel.h

 // 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.
 
-#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>
 
 #include "base/basictypes.h"
 #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;
 
 namespace syncer {
 class GCMNetworkChannel;
 
 // POD with copy of some statuses for debugging purposes.
 struct GCMNetworkChannelDiagnostic {
   explicit GCMNetworkChannelDiagnostic(GCMNetworkChannel* parent);
 
   // Collect all the internal variables in a single readable dictionary.
   scoped_ptr<base::DictionaryValue> CollectDebugData() const;
 
   // TODO(pavely): Move this toString to a more appropiate place in GCMClient.
   std::string GCMClientResultToString(
       const gcm::GCMClient::Result result) const;
 
   GCMNetworkChannel* parent_;
   bool last_message_empty_echo_token_;
   base::Time last_message_received_time_;
   int last_post_response_code_;
   std::string registration_id_;
   gcm::GCMClient::Result registration_result_;
   int sent_messages_count_;
 };
 
 // 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,
       public base::NonThreadSafe {
  public:
   GCMNetworkChannel(
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       scoped_ptr<GCMNetworkChannelDelegate> delegate);
 
   virtual ~GCMNetworkChannel();
@@ skipping 65 matching lines @@
 
   GCMNetworkChannelDiagnostic diagnostic_info_;
 
   base::WeakPtrFactory<GCMNetworkChannel> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMNetworkChannel);
 };
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_H_
+#endif  // COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_