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

google_apis/gcm/engine/gcm_store_impl_unittest.cc

Index: google_apis/gcm/engine/gcm_store_impl_unittest.cc
diff --git a/google_apis/gcm/engine/gcm_store_impl_unittest.cc b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
index a587bc1198ed2cef7d82a6da78d0c41a9f968894..da7f3d48502eabde519ebb8efd21e5190d511572 100644
--- a/google_apis/gcm/engine/gcm_store_impl_unittest.cc
+++ b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
@@ -15,7 +15,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.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/protocol/mcs.pb.h"
@@ -60,6 +60,7 @@ class GCMStoreImplTest : public testing::Test {
  protected:
   base::MessageLoop message_loop_;
   base::ScopedTempDir temp_directory_;
+  FakeEncryptor fake_encryptor_;
   bool expected_success_;
   uint64 next_persistent_id_;
   scoped_ptr<base::RunLoop> run_loop_;
@@ -76,16 +77,13 @@ GCMStoreImplTest::~GCMStoreImplTest() {}
 
 void GCMStoreImplTest::SetUp() {
   testing::Test::SetUp();
-#if defined(OS_MACOSX)
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      os_crypt::switches::kUseMockKeychain);
-#endif  // OS_MACOSX
 }
 
 scoped_ptr<GCMStore> GCMStoreImplTest::BuildGCMStore() {
   return scoped_ptr<GCMStore>(new GCMStoreImpl(
       temp_directory_.path(),
-      message_loop_.message_loop_proxy()));
+      message_loop_.message_loop_proxy(),
+      &fake_encryptor_));
 }
 
 std::string GCMStoreImplTest::GetNextPersistentId() {