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

google_apis/gcm/engine/gcm_store_impl_unittest.cc

Index: google_apis/gcm/engine/gcm_store_impl_unittest.cc
diff --git a/google_apis/gcm/engine/gcm_store_impl_unittest.cc b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
index 41bb427d696e445b1ff930f13752710c0709e611..af5fc3addaa0fcfb0a3a795bf3776c8fcff491e3 100644
--- a/google_apis/gcm/engine/gcm_store_impl_unittest.cc
+++ b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
@@ -14,7 +14,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
-#include "components/os_crypt/os_crypt.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
@@ -72,10 +71,8 @@
 GCMStoreImplTest::~GCMStoreImplTest() {}
 
 scoped_ptr<GCMStore> GCMStoreImplTest::BuildGCMStore() {
-#if defined(OS_MACOSX)
-  OSCrypt::UseMockKeychain(true);
-#endif
   return scoped_ptr<GCMStore>(new GCMStoreImpl(
+      true,
       temp_directory_.path(),
       message_loop_.message_loop_proxy()));
 }