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

google_apis/gcm/gcm_client_impl_unittest.cc

Index: google_apis/gcm/gcm_client_impl_unittest.cc
diff --git a/google_apis/gcm/gcm_client_impl_unittest.cc b/google_apis/gcm/gcm_client_impl_unittest.cc
index 39fb3f1de75112f1698e7e340eb3518d48173152..229feab49888790de8203e40bd22f7a01b41abb1 100644
--- a/google_apis/gcm/gcm_client_impl_unittest.cc
+++ b/google_apis/gcm/gcm_client_impl_unittest.cc
@@ -13,7 +13,6 @@
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/engine/fake_connection_factory.h"
 #include "google_apis/gcm/engine/fake_connection_handler.h"
-#include "google_apis/gcm/engine/gcm_store_impl.h"
 #include "google_apis/gcm/protocol/android_checkin.pb.h"
 #include "google_apis/gcm/protocol/checkin.pb.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
@@ -118,10 +117,6 @@
   virtual ~FakeGCMInternalsBuilder();
 
   virtual scoped_ptr<base::Clock> BuildClock() OVERRIDE;
-  virtual scoped_ptr<GCMStore> BuildGCMStore(
-      const base::FilePath& path,
-      const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner)
-      OVERRIDE;
   virtual scoped_ptr<MCSClient> BuildMCSClient(
       const std::string& version,
       base::Clock* clock,
@@ -140,16 +135,6 @@
 
 scoped_ptr<base::Clock> FakeGCMInternalsBuilder::BuildClock() {
   return make_scoped_ptr<base::Clock>(new base::SimpleTestClock());
-}
-
-scoped_ptr<GCMStore> FakeGCMInternalsBuilder::BuildGCMStore(
-      const base::FilePath& path,
-      const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner) {
-#if defined(OS_MACOSX)
-  OSCrypt::UseMockKeychain(true);
-#endif
-  return make_scoped_ptr<GCMStore>(
-      new GCMStoreImpl(path, blocking_task_runner));
 }
 
 scoped_ptr<MCSClient> FakeGCMInternalsBuilder::BuildMCSClient(