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

google_apis/gcm/gcm_client_impl.cc

Index: google_apis/gcm/gcm_client_impl.cc
diff --git a/google_apis/gcm/gcm_client_impl.cc b/google_apis/gcm/gcm_client_impl.cc
index 568e740384cb490c36813a0e3c9a2ef17a43801d..9aaa043285e8774c24159866596b7134fad6274b 100644
--- a/google_apis/gcm/gcm_client_impl.cc
+++ b/google_apis/gcm/gcm_client_impl.cc
@@ -125,13 +125,6 @@
   return make_scoped_ptr<base::Clock>(new base::DefaultClock());
 }
 
-scoped_ptr<GCMStore> GCMInternalsBuilder::BuildGCMStore(
-    const base::FilePath& path,
-    const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner) {
-  return make_scoped_ptr<GCMStore>(
-      new GCMStoreImpl(path, blocking_task_runner));
-}
-
 scoped_ptr<MCSClient> GCMInternalsBuilder::BuildMCSClient(
     const std::string& version,
     base::Clock* clock,
@@ -192,8 +185,7 @@
   chrome_build_proto_.CopyFrom(chrome_build_proto);
   account_ids_ = account_ids;
 
-  gcm_store_ =
-      internals_builder_->BuildGCMStore(path, blocking_task_runner).Pass();
+  gcm_store_.reset(new GCMStoreImpl(false, path, blocking_task_runner));
 
   delegate_ = delegate;