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

google_apis/gcm/engine/gcm_store_impl.cc

Index: google_apis/gcm/engine/gcm_store_impl.cc
diff --git a/google_apis/gcm/engine/gcm_store_impl.cc b/google_apis/gcm/engine/gcm_store_impl.cc
index 9bd562d83eda2b0d15b8dbf2f4ded7a0708246c7..3a74127c4b9607a52bc76da8848e2c372096ea24 100644
--- a/google_apis/gcm/engine/gcm_store_impl.cc
+++ b/google_apis/gcm/engine/gcm_store_impl.cc
@@ -605,11 +605,16 @@
 }
 
 GCMStoreImpl::GCMStoreImpl(
+    bool use_mock_keychain,
     const base::FilePath& path,
     scoped_refptr<base::SequencedTaskRunner> blocking_task_runner)
     : backend_(new Backend(path, base::MessageLoopProxy::current())),
       blocking_task_runner_(blocking_task_runner),
       weak_ptr_factory_(this) {
+// On OSX, prevent the Keychain permissions popup during unit tests.
+#if defined(OS_MACOSX)
+  OSCrypt::UseMockKeychain(use_mock_keychain);
+#endif
 }
 
 GCMStoreImpl::~GCMStoreImpl() {}