Revert of Removing the mock-keychain related bool from GCMStore constructor

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>
@@ skipping 282 matching lines @@
   std::vector<GURL> endpoints(1,
                               GURL("https://" +
                                    net::HostPortPair(server_host_,
                                                      server_port_).ToString()));
   connection_factory_.reset(
       new ConnectionFactoryImpl(endpoints,
                                 kDefaultBackoffPolicy,
                                 network_session_,
                                 &net_log_));
   gcm_store_.reset(
-      new GCMStoreImpl(gcm_store_path_,
+      new GCMStoreImpl(true,
+                       gcm_store_path_,
                        file_thread_.message_loop_proxy()));
   mcs_client_.reset(new MCSClient("probe",
                                   &clock_,
                                   connection_factory_.get(),
                                   gcm_store_.get()));
   run_loop_.reset(new base::RunLoop());
   gcm_store_->Load(base::Bind(&MCSProbe::LoadCallback,
                               base::Unretained(this)));
   run_loop_->Run();
 }
@@ skipping 167 matching lines @@
 
   return 0;
 }
 
 }  // namespace
 }  // namespace gcm
 
 int main(int argc, char* argv[]) {
   return gcm::MCSProbeMain(argc, argv);
 }