Renaming RMQStore to GCMStore and breaking out its interface

google_apis/gcm/tools/mcs_probe.cc

 // Copyright 2013 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.
 //
 // A standalone tool for testing MCS connections and the MCS client on their
 // own.
 
 #include <cstddef>
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/worker_pool.h"
 #include "base/time/default_clock.h"
 #include "base/values.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/engine/connection_factory_impl.h"
+#include "google_apis/gcm/engine/gcm_store_impl.h"
 #include "google_apis/gcm/engine/mcs_client.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/base/net_log_logger.h"
 #include "net/cert/cert_verifier.h"
 #include "net/dns/host_resolver.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/http/transport_security_state.h"
 #include "net/socket/client_socket_factory.h"
@@ skipping 131 matching lines @@
   void BuildNetworkSession();
 
   void InitializationCallback(bool success,
                               uint64 restored_android_id,
                               uint64 restored_security_token);
 
   base::DefaultClock clock_;
 
   CommandLine command_line_;
 
-  base::FilePath rmq_path_;
+  base::FilePath gcm_store_path_;
   uint64 android_id_;
   uint64 secret_;
   std::string server_host_;
   int server_port_;
 
   // Network state.
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
   MyTestNetLog net_log_;
   scoped_ptr<net::NetLogLogger> logger_;
   scoped_ptr<base::Value> net_constants_;
   scoped_ptr<net::HostResolver> host_resolver_;
   scoped_ptr<net::CertVerifier> cert_verifier_;
   scoped_ptr<net::ServerBoundCertService> system_server_bound_cert_service_;
   scoped_ptr<net::TransportSecurityState> transport_security_state_;
   scoped_ptr<net::URLSecurityManager> url_security_manager_;
   scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory_;
   scoped_ptr<net::HttpServerPropertiesImpl> http_server_properties_;
   scoped_ptr<net::HostMappingRules> host_mapping_rules_;
   scoped_refptr<net::HttpNetworkSession> network_session_;
   scoped_ptr<net::ProxyService> proxy_service_;
 
-  scoped_ptr<RMQStore> rmq_store_;
+  scoped_ptr<GCMStore> gcm_store_;
   scoped_ptr<MCSClient> mcs_client_;
 
   scoped_ptr<ConnectionFactoryImpl> connection_factory_;
 
   base::Thread file_thread_;
 
   scoped_ptr<base::RunLoop> run_loop_;
 };
 
 MCSProbe::MCSProbe(
     const CommandLine& command_line,
     scoped_refptr<net::URLRequestContextGetter> url_request_context_getter)
     : command_line_(command_line),
-      rmq_path_(base::FilePath(FILE_PATH_LITERAL("gcm_rmq_store"))),
+      gcm_store_path_(base::FilePath(FILE_PATH_LITERAL("gcm_store"))),
       android_id_(0),
       secret_(0),
       server_port_(0),
       url_request_context_getter_(url_request_context_getter),
       file_thread_("FileThread") {
   if (command_line.HasSwitch(kRMQFileName)) {
-    rmq_path_ = command_line.GetSwitchValuePath(kRMQFileName);
+    gcm_store_path_ = command_line.GetSwitchValuePath(kRMQFileName);
   }
   if (command_line.HasSwitch(kAndroidIdSwitch)) {
     base::StringToUint64(command_line.GetSwitchValueASCII(kAndroidIdSwitch),
                          &android_id_);
   }
   if (command_line.HasSwitch(kSecretSwitch)) {
     base::StringToUint64(command_line.GetSwitchValueASCII(kSecretSwitch),
                          &secret_);
   }
   server_host_ = kMCSServerHost;
@@ skipping 13 matching lines @@
 
 void MCSProbe::Start() {
   file_thread_.Start();
   InitializeNetworkState();
   BuildNetworkSession();
   connection_factory_.reset(
       new ConnectionFactoryImpl(GURL("https://" + net::HostPortPair(
                                     server_host_, server_port_).ToString()),
                                 network_session_,
                                 &net_log_));
-  rmq_store_.reset(new RMQStore(rmq_path_, file_thread_.message_loop_proxy()));
+  gcm_store_.reset(
+      new GCMStoreImpl(gcm_store_path_, file_thread_.message_loop_proxy()));
   mcs_client_.reset(new MCSClient(&clock_,
                                   connection_factory_.get(),
-                                  rmq_store_.get()));
+                                  gcm_store_.get()));
   run_loop_.reset(new base::RunLoop());
-  rmq_store_->Load(base::Bind(&MCSClient::Initialize,
-                              base::Unretained(mcs_client_.get()),
-                              base::Bind(&MCSProbe::InitializationCallback,
-                                         base::Unretained(this)),
-                              base::Bind(&MessageReceivedCallback),
-                              base::Bind(&MessageSentCallback)));
+  gcm_store_->Load(base::Bind(
+      &MCSClient::Initialize,
+      base::Unretained(mcs_client_.get()),
+      base::Bind(&MCSProbe::InitializationCallback, base::Unretained(this)),
+      base::Bind(&MessageReceivedCallback),
+      base::Bind(&MessageSentCallback)));
   run_loop_->Run();
 }
 
 void MCSProbe::InitializeNetworkState() {
   FILE* log_file = NULL;
   if (command_line_.HasSwitch(kLogFileSwitch)) {
     base::FilePath log_path = command_line_.GetSwitchValuePath(kLogFileSwitch);
 #if defined(OS_WIN)
     log_file = _wfopen(log_path.value().c_str(), L"w");
 #elif defined(OS_POSIX)
@@ skipping 93 matching lines @@
 
   return 0;
 }
 
 }  // namespace
 }  // namespace gcm
 
 int main(int argc, char* argv[]) {
   return gcm::MCSProbeMain(argc, argv);
 }