Revert 270226 "Componentize GCM Part 1: create GCM component and..."

trunk/src/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 <vector>
 
 #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/fake_encryptor.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/engine/checkin_request.h"
 #include "google_apis/gcm/engine/connection_factory_impl.h"
 #include "google_apis/gcm/engine/gcm_store_impl.h"
 #include "google_apis/gcm/engine/gservices_settings.h"
 #include "google_apis/gcm/engine/mcs_client.h"
 #include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/base/net_log_logger.h"
@@ skipping 263 matching lines @@
                                    net::HostPortPair(server_host_,
                                                      server_port_).ToString()));
   connection_factory_.reset(
       new ConnectionFactoryImpl(endpoints,
                                 kDefaultBackoffPolicy,
                                 network_session_,
                                 &net_log_,
                                 &recorder_));
   gcm_store_.reset(
       new GCMStoreImpl(gcm_store_path_,
-                       file_thread_.message_loop_proxy(),
-                       make_scoped_ptr<Encryptor>(new FakeEncryptor)));
+                       file_thread_.message_loop_proxy()));
   mcs_client_.reset(new MCSClient("probe",
                                   &clock_,
                                   connection_factory_.get(),
                                   gcm_store_.get(),
                                   &recorder_));
   run_loop_.reset(new base::RunLoop());
   gcm_store_->Load(base::Bind(&MCSProbe::LoadCallback,
                               base::Unretained(this)));
   run_loop_->Run();
 }
@@ skipping 177 matching lines @@
 
   return 0;
 }
 
 }  // namespace
 }  // namespace gcm
 
 int main(int argc, char* argv[]) {
   return gcm::MCSProbeMain(argc, argv);
 }