Client-to-server messages in GCMNetworkChannel

sync/notifier/gcm_network_channel.h

Index: sync/notifier/gcm_network_channel.h
diff --git a/sync/notifier/gcm_network_channel.h b/sync/notifier/gcm_network_channel.h
index b7d97fb41d76bcd176b01c2d60585e8e51ff16a6..c89a136988f3d2d63e8421875c676b31ad8dbd8a 100644
--- a/sync/notifier/gcm_network_channel.h
+++ b/sync/notifier/gcm_network_channel.h
@@ -10,17 +10,25 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.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 {
 
 // GCMNetworkChannel is an implementation of SyncNetworkChannel that routes
 // messages through GCMProfileService.
 class SYNC_EXPORT_PRIVATE GCMNetworkChannel

[rlarocque, 2014/01/16 18:52:48]

The threading code is starting to get complicated.  Would it be possible to make
this class inherit from base::NonThreadSafe to make the rules clearer?

[pavely, 2014/01/17 00:44:39]

Actually everything that happens to this class is supposed to happen on one
thread. 
I'll add NonThreadSafe and checks.
On 2014/01/16 18:52:48, rlarocque wrote:

-    : public SyncNetworkChannel {
+    : public SyncNetworkChannel,
+      public net::URLFetcherDelegate {
  public:
-  explicit GCMNetworkChannel();
+  explicit GCMNetworkChannel(
+      scoped_refptr<net::URLRequestContextGetter> request_context_getter,
+      scoped_ptr<GCMNetworkChannelDelegate> delegate);
 
   virtual ~GCMNetworkChannel();
 
@@ -29,7 +37,36 @@ class SYNC_EXPORT_PRIVATE GCMNetworkChannel
   virtual void UpdateCredentials(const std::string& email,
       const std::string& token) OVERRIDE;
 
+  // URLFetcherDelegate implementation.
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+
  private:
+  void OnRegisterComplete(const std::string& registration_id,
+      gcm::GCMClient::Result result);
+  void RequestAccessToken();
+  void OnGetTokenComplete(const GoogleServiceAuthError& error,
+      const std::string& token);
+  GURL BuildUrl();
+
+  scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
+  scoped_ptr<GCMNetworkChannelDelegate> delegate_;
+
+  // Message is saved until all conditions are met: there is valid
+  // registration_id and access_token.
+  std::string encoded_message_;
+
+  // Access token is saved because in case of auth failure from server we need
+  // to invalidate it.
+  std::string access_token_;
+
+  // GCM registration_id is requested one at startup and never refreshed until
+  // next restart.
+  std::string registration_id_;
+
+  scoped_ptr<net::URLFetcher> fetcher_;
+
+  base::WeakPtrFactory<GCMNetworkChannel> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(GCMNetworkChannel);
 };