Componentize GCM Part 1: create GCM component and move some files over

google_apis/gcm/gcm_client_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/gcm_client_impl.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/time/clock.h"
-#include "components/os_crypt/os_crypt_switches.h"
+#include "google_apis/gcm/base/fake_encryptor.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/gservices_settings.h"
 #include "google_apis/gcm/monitoring/gcm_stats_recorder.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"
 #include "net/url_request/test_url_fetcher_factory.h"
@@ skipping 298 matching lines @@
     : last_event_(NONE),
       last_result_(GCMClient::UNKNOWN_ERROR),
       url_request_context_getter_(new net::TestURLRequestContextGetter(
           message_loop_.message_loop_proxy())) {
 }
 
 GCMClientImplTest::~GCMClientImplTest() {}
 
 void GCMClientImplTest::SetUp() {
   testing::Test::SetUp();
-#if defined(OS_MACOSX)
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      os_crypt::switches::kUseMockKeychain);
-#endif  // OS_MACOSX
   ASSERT_TRUE(CreateUniqueTempDir());
   InitializeLoop();
   BuildGCMClient(base::TimeDelta());
   InitializeGCMClient();
   CompleteCheckin(kDeviceAndroidId,
                   kDeviceSecurityToken,
                   std::string(),
                   std::map<std::string, std::string>());
 }
 
@@ skipping 14 matching lines @@
 
 void GCMClientImplTest::InitializeLoop() {
   run_loop_.reset(new base::RunLoop);
 }
 
 bool GCMClientImplTest::CreateUniqueTempDir() {
   return temp_directory_.CreateUniqueTempDir();
 }
 
 void GCMClientImplTest::BuildGCMClient(base::TimeDelta clock_step) {
-  gcm_client_.reset(new GCMClientImpl(make_scoped_ptr<GCMInternalsBuilder>(
-      new FakeGCMInternalsBuilder(clock_step))));
+  gcm_client_.reset(new GCMClientImpl(
+      make_scoped_ptr<GCMInternalsBuilder>(
+          new FakeGCMInternalsBuilder(clock_step)),
+      make_scoped_ptr<FakeEncryptor>(new FakeEncryptor)));
 }
 
 void GCMClientImplTest::CompleteCheckin(
     uint64 android_id,
     uint64 security_token,
     const std::string& digest,
     const std::map<std::string, std::string>& settings) {
   checkin_proto::AndroidCheckinResponse response;
   response.set_stats_ok(true);
   response.set_android_id(android_id);
@@ skipping 312 matching lines @@
 };
 
 GCMClientImplCheckinTest::GCMClientImplCheckinTest() {
 }
 
 GCMClientImplCheckinTest::~GCMClientImplCheckinTest() {
 }
 
 void GCMClientImplCheckinTest::SetUp() {
   testing::Test::SetUp();
-#if defined(OS_MACOSX)
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      os_crypt::switches::kUseMockKeychain);
-#endif  // OS_MACOSX
   // Creating unique temp directory that will be used by GCMStore shared between
   // GCM Client and G-services settings.
   ASSERT_TRUE(CreateUniqueTempDir());
   InitializeLoop();
   // Time will be advancing one hour every time it is checked.
   BuildGCMClient(base::TimeDelta::FromSeconds(kSettingsCheckinInterval));
   InitializeGCMClient();
 }
 
 TEST_F(GCMClientImplCheckinTest, GServicesSettingsAfterInitialCheckin) {
@@ skipping 20 matching lines @@
   CompleteCheckin(
       kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings);
   EXPECT_EQ(2, clock()->call_count());
 
   PumpLoopUntilIdle();
   CompleteCheckin(
       kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings);
 }
 
 }  // namespace gcm