Rename components's Encryptor to OSEncrypt.

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 42ecf86975b3e663ce232e3816b622b3eb678723..234a390886dfe1cb42094a2c2e25969ca4c9eb12 100644
--- a/google_apis/gcm/gcm_client_impl_unittest.cc
+++ b/google_apis/gcm/gcm_client_impl_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/simple_test_clock.h"
-#include "components/encryptor/encryptor.h"
+#include "components/encryptor/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"
@@ -286,7 +286,7 @@ void GCMClientImplTest::InitializeGCMClient() {
                           this);
 #if defined(OS_MACOSX)
   // On OSX, prevent the Keychain permissions popup during unit tests.
-  Encryptor::UseMockKeychain(true);  // Must be after Initialize.
+  OSCrypt::UseMockKeychain(true);  // Must be after Initialize.
 #endif
   // Ensuring that mcs_client is using the same gcm_store as gcm_client.
   mcs_client()->set_gcm_store(gcm_client_->gcm_store_.get());