Removing the mock-keychain related bool from GCMStore constructor

google_apis/gcm/engine/mcs_client_unittest.cc

 // Copyright 2013 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/mcs_client.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"
+#include "google_apis/gcm/engine/gcm_internals_builder.h"
 #include "google_apis/gcm/engine/gcm_store_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 namespace {
 
 const uint64 kAndroidId = 54321;
 const uint64 kSecurityToken = 12345;
 
@@ skipping 110 matching lines @@
 };
 
 MCSClientTest::MCSClientTest()
     : run_loop_(new base::RunLoop()),
       init_success_(true),
       restored_android_id_(0),
       restored_security_token_(0),
       message_send_status_(MCSClient::SENT) {
   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::BuildMCSClient() {
-  gcm_store_.reset(new GCMStoreImpl(true,
-                                    temp_directory_.path(),
-                                    message_loop_.message_loop_proxy()));
+  GCMInternalsBuilder builder;
+  builder.SetUpForTesting();
+  gcm_store_ = builder.BuildGCMStore(temp_directory_.path(),
+                                     message_loop_.message_loop_proxy());
   mcs_client_.reset(new TestMCSClient(&clock_,
                                       &connection_factory_,
                                       gcm_store_.get()));
 }
 
 void MCSClientTest::InitializeClient() {
   gcm_store_->Load(base::Bind(
       &MCSClient::Initialize,
       base::Unretained(mcs_client_.get()),
       base::Bind(&MCSClientTest::ErrorCallback,
@@ skipping 610 matching lines @@
 
   LoginClient(std::vector<std::string>());
   GetFakeHandler()->ExpectOutgoingMessage(message);
   GetFakeHandler()->ExpectOutgoingMessage(message2);
   PumpLoop();
 }
 
 } // namespace
 
 }  // namespace gcm