Index: google_apis/gcm/engine/mcs_client_unittest.cc |
diff --git a/google_apis/gcm/engine/mcs_client_unittest.cc b/google_apis/gcm/engine/mcs_client_unittest.cc |
index 5983ddd747ec41a82575874611151c1afb09df60..f20475f0fe85badbc5ed738cad1d2bd7f088f819 100644 |
--- a/google_apis/gcm/engine/mcs_client_unittest.cc |
+++ b/google_apis/gcm/engine/mcs_client_unittest.cc |
@@ -4,12 +4,12 @@ |
#include "google_apis/gcm/engine/mcs_client.h" |
+#include "base/command_line.h" |
#include "base/files/scoped_temp_dir.h" |
#include "base/message_loop/message_loop.h" |
#include "base/run_loop.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/test/simple_test_clock.h" |
-#include "components/os_crypt/os_crypt.h" |
#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" |
@@ -84,6 +84,8 @@ class MCSClientTest : public testing::Test { |
MCSClientTest(); |
virtual ~MCSClientTest(); |
+ virtual void SetUp() OVERRIDE; |
+ |
void BuildMCSClient(); |
void InitializeClient(); |
void StoreCredentials(); |
@@ -144,20 +146,18 @@ MCSClientTest::MCSClientTest() |
EXPECT_TRUE(temp_directory_.CreateUniqueTempDir()); |
run_loop_.reset(new base::RunLoop()); |
- // On OSX, prevent the Keychain permissions popup during unit tests. |
-#if defined(OS_MACOSX) |
- OSCrypt::UseMockKeychain(true); |
-#endif |
- |
// Advance the clock to a non-zero time. |
clock_.Advance(base::TimeDelta::FromSeconds(1)); |
} |
MCSClientTest::~MCSClientTest() {} |
+void MCSClientTest::SetUp() { |
+ base::CommandLine::ForCurrentProcess()->AppendSwitch("use-mock-keychain"); |
jianli
2014/04/10 18:38:12
nit: better call testing::Test::SetUp()
fgorski
2014/04/10 19:01:15
Done.
|
+} |
+ |
void MCSClientTest::BuildMCSClient() { |
- gcm_store_.reset(new GCMStoreImpl(true, |
- temp_directory_.path(), |
+ gcm_store_.reset(new GCMStoreImpl(temp_directory_.path(), |
message_loop_.message_loop_proxy())); |
mcs_client_.reset(new TestMCSClient(&clock_, |
&connection_factory_, |