| Index: trunk/src/google_apis/gcm/engine/mcs_client.h
|
| ===================================================================
|
| --- trunk/src/google_apis/gcm/engine/mcs_client.h (revision 264317)
|
| +++ trunk/src/google_apis/gcm/engine/mcs_client.h (working copy)
|
| @@ -37,7 +37,6 @@
|
|
|
| class CollapseKey;
|
| class ConnectionFactory;
|
| -class GCMStatsRecorder;
|
| struct ReliablePacketInfo;
|
|
|
| // An MCS client. This client is in charge of all communications with an
|
| @@ -55,8 +54,6 @@
|
| CONNECTED, // Connected and running.
|
| };
|
|
|
| - // Any change made to this enum should have corresponding change in the
|
| - // GetMessageSendStatusString(...) function in mcs_client.cc.
|
| enum MessageSendStatus {
|
| // Message was queued succcessfully.
|
| QUEUED,
|
| @@ -64,19 +61,14 @@
|
| SENT,
|
| // Message not saved, because total queue size limit reached.
|
| QUEUE_SIZE_LIMIT_REACHED,
|
| - // Message not saved, because app queue size limit reached.
|
| + // Messgae not saved, because app queue size limit reached.
|
| APP_QUEUE_SIZE_LIMIT_REACHED,
|
| // Message too large to send.
|
| MESSAGE_TOO_LARGE,
|
| // Message not send becuase of TTL = 0 and no working connection.
|
| NO_CONNECTION_ON_ZERO_TTL,
|
| // Message exceeded TTL.
|
| - TTL_EXCEEDED,
|
| -
|
| - // NOTE: always keep this entry at the end. Add new status types only
|
| - // immediately above this line. Make sure to update the corresponding
|
| - // histogram enum accordingly.
|
| - SEND_STATUS_COUNT
|
| + TTL_EXCEEDED
|
| };
|
|
|
| // Callback for MCSClient's error conditions.
|
| @@ -97,8 +89,7 @@
|
| MCSClient(const std::string& version_string,
|
| base::Clock* clock,
|
| ConnectionFactory* connection_factory,
|
| - GCMStore* gcm_store,
|
| - GCMStatsRecorder* recorder);
|
| + GCMStore* gcm_store);
|
| virtual ~MCSClient();
|
|
|
| // Initialize the client. Will load any previous id/token information as well
|
| @@ -136,12 +127,6 @@
|
| // Returns the current state of the client.
|
| State state() const { return state_; }
|
|
|
| - // Returns the size of the send message queue.
|
| - int GetSendQueueSize() const;
|
| -
|
| - // Returns the size of the resend messaage queue.
|
| - int GetResendQueueSize() const;
|
| -
|
| // Returns text representation of the state enum.
|
| std::string GetStateString() const;
|
|
|
| @@ -274,9 +259,6 @@
|
| // Manager to handle triggering/detecting heartbeats.
|
| HeartbeatManager heartbeat_manager_;
|
|
|
| - // Recorder that records GCM activities for debugging purpose. Not owned.
|
| - GCMStatsRecorder* recorder_;
|
| -
|
| base::WeakPtrFactory<MCSClient> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MCSClient);
|
|
|