Removing the mock-keychain related bool from GCMStore constructor

google_apis/gcm/gcm_client_impl_unittest.cc

Index: google_apis/gcm/gcm_client_impl_unittest.cc
diff --git a/google_apis/gcm/gcm_client_impl_unittest.cc b/google_apis/gcm/gcm_client_impl_unittest.cc
index 229feab49888790de8203e40bd22f7a01b41abb1..7c2710d2c10179f8694b7fc5d60d26294eafe0e5 100644
--- a/google_apis/gcm/gcm_client_impl_unittest.cc
+++ b/google_apis/gcm/gcm_client_impl_unittest.cc
@@ -8,11 +8,12 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/simple_test_clock.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/engine/fake_connection_factory.h"
 #include "google_apis/gcm/engine/fake_connection_handler.h"
+#include "google_apis/gcm/engine/gcm_internals_builder.h"
+#include "google_apis/gcm/engine/gcm_store_impl.h"
 #include "google_apis/gcm/protocol/android_checkin.pb.h"
 #include "google_apis/gcm/protocol/checkin.pb.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
@@ -290,8 +291,9 @@ void GCMClientImplTest::QuitLoop() {
 }
 
 void GCMClientImplTest::BuildGCMClient() {
-  gcm_client_.reset(new GCMClientImpl(
-      make_scoped_ptr<GCMInternalsBuilder>(new FakeGCMInternalsBuilder())));
+  scoped_ptr<GCMInternalsBuilder> builder(new FakeGCMInternalsBuilder());
+  builder->SetUpForTesting();
+  gcm_client_.reset(new GCMClientImpl(builder.Pass()));
 }
 
 void GCMClientImplTest::CompleteCheckin(uint64 android_id,
@@ -362,11 +364,6 @@ void GCMClientImplTest::InitializeGCMClient() {
                           url_request_context_getter_,
                           this);
 
-#if defined(OS_MACOSX)
-  // On OSX, prevent the Keychain permissions popup during unit tests.
-  OSCrypt::UseMockKeychain(true);  // Must be after Initialize.
-#endif
-
   // Start loading and check-in.
   gcm_client_->Load();