| Index: sync/notifier/gcm_network_channel.h
|
| diff --git a/sync/notifier/gcm_network_channel.h b/sync/notifier/gcm_network_channel.h
|
| index 5f86ce768d35e70af24e788f552c3be3642acaed..16bcfc82392cf8138473f6649e57974f132faa9f 100644
|
| --- a/sync/notifier/gcm_network_channel.h
|
| +++ b/sync/notifier/gcm_network_channel.h
|
| @@ -33,14 +33,14 @@ struct GCMNetworkChannelDiagnostic {
|
|
|
| // TODO(pavely): Move this toString to a more appropiate place in GCMClient.
|
| std::string GCMClientResultToString(
|
| - const gcm::GCMClient::Result result) const;
|
| + const gcm::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_;
|
| + gcm::Result registration_result_;
|
| int sent_messages_count_;
|
| };
|
|
|
| @@ -87,7 +87,7 @@ class SYNC_EXPORT_PRIVATE GCMNetworkChannel
|
| friend class GCMNetworkChannelTest;
|
| void Register();
|
| void OnRegisterComplete(const std::string& registration_id,
|
| - gcm::GCMClient::Result result);
|
| + gcm::Result result);
|
| void RequestAccessToken();
|
| void OnGetTokenComplete(const GoogleServiceAuthError& error,
|
| const std::string& token);
|
|
|