[GCM] 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 af5fc3addaa0fcfb0a3a795bf3776c8fcff491e3..cf9dfc48a58bac1220c34dc7198f0958d8f169c2 100644
--- a/google_apis/gcm/engine/gcm_store_impl_unittest.cc
+++ b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
@@ -43,6 +44,8 @@ class GCMStoreImplTest : public testing::Test {
   GCMStoreImplTest();
   virtual ~GCMStoreImplTest();
 
+  virtual void SetUp() OVERRIDE;
+
   scoped_ptr<GCMStore> BuildGCMStore();
 
   std::string GetNextPersistentId();
@@ -70,9 +73,12 @@ GCMStoreImplTest::GCMStoreImplTest()
 
 GCMStoreImplTest::~GCMStoreImplTest() {}
 
+void GCMStoreImplTest::SetUp() {
+  base::CommandLine::ForCurrentProcess()->AppendSwitch("use-mock-keychain");

[jianli, 2014/04/10 18:38:12]

better call testing::Test::SetUp();

[Nicolas Zea, 2014/04/10 18:54:48]

That's not necessary, it doesn't do anything. Overriding SetUp on its own is
common.

That said, I think you should #include "os_crypt_switches" and use
kUseMockKeychain here instead of the actual switch.

[fgorski, 2014/04/10 19:01:15]

Putting both in (in all 3 files) 

+}
+
 scoped_ptr<GCMStore> GCMStoreImplTest::BuildGCMStore() {
   return scoped_ptr<GCMStore>(new GCMStoreImpl(
-      true,
       temp_directory_.path(),
       message_loop_.message_loop_proxy()));
 }