[GCM] Removing the mock-keychain related bool from GCMStore constructor

google_apis/gcm/engine/gcm_store_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/gcm/engine/gcm_store_impl.h"
 
 #include <string>
 #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"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.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"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 15 matching lines @@
 const char kCategoryName[] = "my_category";
 
 const uint64 kDeviceId = 22;
 const uint64 kDeviceToken = 55;
 
 class GCMStoreImplTest : public testing::Test {
  public:
   GCMStoreImplTest();
   virtual ~GCMStoreImplTest();
 
+  virtual void SetUp() OVERRIDE;
+
   scoped_ptr<GCMStore> BuildGCMStore();
 
   std::string GetNextPersistentId();
 
   void PumpLoop();
 
   void LoadCallback(scoped_ptr<GCMStore::LoadResult>* result_dst,
                     scoped_ptr<GCMStore::LoadResult> result);
   void UpdateCallback(bool success);
 
  protected:
   base::MessageLoop message_loop_;
   base::ScopedTempDir temp_directory_;
   bool expected_success_;
   uint64 next_persistent_id_;
   scoped_ptr<base::RunLoop> run_loop_;
 };
 
 GCMStoreImplTest::GCMStoreImplTest()
     : expected_success_(true),
       next_persistent_id_(base::Time::Now().ToInternalValue()) {
   EXPECT_TRUE(temp_directory_.CreateUniqueTempDir());
   run_loop_.reset(new base::RunLoop());
 }
 
 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()));
 }
 
 std::string GCMStoreImplTest::GetNextPersistentId() {
   return base::Uint64ToString(next_persistent_id_++);
 }
 
 void GCMStoreImplTest::PumpLoop() { message_loop_.RunUntilIdle(); }
 
@@ skipping 401 matching lines @@
 
   gcm_store->Load(base::Bind(&GCMStoreImplTest::LoadCallback,
                              base::Unretained(this),
                              &load_result));
   PumpLoop();
 }
 
 }  // namespace
 
 }  // namespace gcm