Renaming RMQStore to GCMStore and breaking out its interface

google_apis/gcm/engine/mcs_client.cc

Index: google_apis/gcm/engine/mcs_client.cc
diff --git a/google_apis/gcm/engine/mcs_client.cc b/google_apis/gcm/engine/mcs_client.cc
index 07f1004af2eab3e4365b2019065e6b486d6f3591..8ffa9d1063808797cd27eecc2ac87b3226d10a9c 100644
--- a/google_apis/gcm/engine/mcs_client.cc
+++ b/google_apis/gcm/engine/mcs_client.cc
@@ -10,7 +10,6 @@
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/base/socket_stream.h"
 #include "google_apis/gcm/engine/connection_factory.h"
-#include "google_apis/gcm/engine/rmq_store.h"
 
 using namespace google::protobuf::io;
 
@@ -86,7 +85,7 @@ ReliablePacketInfo::ReliablePacketInfo()
 }
 ReliablePacketInfo::~ReliablePacketInfo() {}
 
-MCSClient::MCSClient(ConnectionFactory* connection_factory, RMQStore* rmq_store)
+MCSClient::MCSClient(ConnectionFactory* connection_factory, GCMStore* gcm_store)
     : state_(UNINITIALIZED),
       android_id_(0),
       security_token_(0),
@@ -96,12 +95,11 @@ MCSClient::MCSClient(ConnectionFactory* connection_factory, RMQStore* rmq_store)
       last_server_to_device_stream_id_received_(0),
       stream_id_out_(0),
       stream_id_in_(0),
-      rmq_store_(rmq_store),
+      gcm_store_(gcm_store),
       heartbeat_interval_(
           base::TimeDelta::FromSeconds(kHeartbeatDefaultSeconds)),
       heartbeat_timer_(true, true),
-      weak_ptr_factory_(this) {
-}
+      weak_ptr_factory_(this) {}
 
 MCSClient::~MCSClient() {
 }
@@ -110,7 +108,7 @@ void MCSClient::Initialize(
     const InitializationCompleteCallback& initialization_callback,
     const OnMessageReceivedCallback& message_received_callback,
     const OnMessageSentCallback& message_sent_callback,
-    const RMQStore::LoadResult& load_result) {
+    const GCMStore::LoadResult& load_result) {
   DCHECK_EQ(state_, UNINITIALIZED);
   initialization_callback_ = initialization_callback;
   message_received_callback_ = message_received_callback;
@@ -190,10 +188,10 @@ void MCSClient::Login(uint64 android_id, uint64 security_token) {
     DCHECK(restored_unackeds_server_ids_.empty());
     android_id_ = android_id;
     security_token_ = security_token;
-    rmq_store_->SetDeviceCredentials(
+    gcm_store_->SetDeviceCredentials(
         android_id_,
         security_token_,
-        base::Bind(&MCSClient::OnRMQUpdateFinished,
+        base::Bind(&MCSClient::OnGCMUpdateFinished,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
@@ -225,11 +223,11 @@ void MCSClient::SendMessage(const MCSMessage& message, bool use_rmq) {
     packet_info->persistent_id = persistent_id;
     SetPersistentId(persistent_id,
                     packet_info->protobuf.get());
-    rmq_store_->AddOutgoingMessage(persistent_id,
-                                   MCSMessage(message.tag(),
-                                              *(packet_info->protobuf)),
-                                   base::Bind(&MCSClient::OnRMQUpdateFinished,
-                                              weak_ptr_factory_.GetWeakPtr()));
+    gcm_store_->AddOutgoingMessage(
+        persistent_id,
+        MCSMessage(message.tag(), *(packet_info->protobuf)),
+        base::Bind(&MCSClient::OnGCMUpdateFinished,
+                   weak_ptr_factory_.GetWeakPtr()));
   } else {
     // Check that there is an active connection to the endpoint.
     if (!connection_handler_->CanSendMessage()) {
@@ -244,7 +242,7 @@ void MCSClient::SendMessage(const MCSMessage& message, bool use_rmq) {
 }
 
 void MCSClient::Destroy() {
-  rmq_store_->Destroy(base::Bind(&MCSClient::OnRMQUpdateFinished,
+  gcm_store_->Destroy(base::Bind(&MCSClient::OnGCMUpdateFinished,
                                  weak_ptr_factory_.GetWeakPtr()));
 }
 
@@ -309,7 +307,7 @@ void MCSClient::SendHeartbeat() {
               false);
 }
 
-void MCSClient::OnRMQUpdateFinished(bool success) {
+void MCSClient::OnGCMUpdateFinished(bool success) {
   LOG_IF(ERROR, !success) << "RMQ Update failed!";
   // TODO(zea): Rebuild the store from scratch in case of persistence failure?
 }
@@ -428,8 +426,8 @@ void MCSClient::HandlePacketFromWire(
   ++stream_id_in_;
   if (!persistent_id.empty()) {
     unacked_server_ids_[stream_id_in_] = persistent_id;
-    rmq_store_->AddIncomingMessage(persistent_id,
-                                   base::Bind(&MCSClient::OnRMQUpdateFinished,
+    gcm_store_->AddIncomingMessage(persistent_id,
+                                   base::Bind(&MCSClient::OnGCMUpdateFinished,
                                               weak_ptr_factory_.GetWeakPtr()));
   }
 
@@ -569,9 +567,9 @@ void MCSClient::HandleStreamAck(StreamId last_stream_id_received) {
   DVLOG(1) << "Server acked " << acked_outgoing_persistent_ids.size()
            << " outgoing messages, " << to_resend_.size()
            << " remaining unacked";
-  rmq_store_->RemoveOutgoingMessages(
+  gcm_store_->RemoveOutgoingMessages(
       acked_outgoing_persistent_ids,
-      base::Bind(&MCSClient::OnRMQUpdateFinished,
+      base::Bind(&MCSClient::OnGCMUpdateFinished,
                  weak_ptr_factory_.GetWeakPtr()));
 
   HandleServerConfirmedReceipt(last_stream_id_received);
@@ -613,9 +611,9 @@ void MCSClient::HandleSelectiveAck(const PersistentIdList& id_list) {
 
   DVLOG(1) << "Server acked " << id_list.size()
            << " messages, " << to_resend_.size() << " remaining unacked.";
-  rmq_store_->RemoveOutgoingMessages(
+  gcm_store_->RemoveOutgoingMessages(
       id_list,
-      base::Bind(&MCSClient::OnRMQUpdateFinished,
+      base::Bind(&MCSClient::OnGCMUpdateFinished,
                  weak_ptr_factory_.GetWeakPtr()));
 
   // Resend any remaining outgoing messages, as they were not received by the
@@ -647,9 +645,9 @@ void MCSClient::HandleServerConfirmedReceipt(StreamId device_stream_id) {
 
   DVLOG(1) << "Server confirmed receipt of " << acked_incoming_ids.size()
            << " acknowledged server messages.";
-  rmq_store_->RemoveIncomingMessages(
+  gcm_store_->RemoveIncomingMessages(
       acked_incoming_ids,
-      base::Bind(&MCSClient::OnRMQUpdateFinished,
+      base::Bind(&MCSClient::OnGCMUpdateFinished,
                  weak_ptr_factory_.GetWeakPtr()));
 }