Rename components's Encryptor to OSEncrypt.

chrome/browser/net/cookie_store_util.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 "chrome/browser/net/cookie_store_util.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/evicted_domain_cookie_counter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/encryptor/encryptor.h"
+#include "components/encryptor/os_crypt.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_crypto_delegate.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/content_constants.h"
 #include "extensions/common/constants.h"
 
 using content::BrowserThread;
 
 namespace {
@@ skipping 70 matching lines @@
 }
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 namespace {
 
 // Use the operating system's mechanisms to encrypt cookies before writing
 // them to persistent store.  Currently this only is done with desktop OS's
 // because ChromeOS and Android already protect the entire profile contents.
 //
 // TODO(bcwhite): Enable on MACOSX -- requires all Cookie tests to call
-// Encryptor::UseMockKeychain or will hang waiting for user input.
+// OSCrypt::UseMockKeychain or will hang waiting for user input.
 class CookieOSCryptoDelegate : public content::CookieCryptoDelegate {
  public:
   virtual bool EncryptString(const std::string& plaintext,
                              std::string* ciphertext) OVERRIDE;
   virtual bool DecryptString(const std::string& ciphertext,
                              std::string* plaintext) OVERRIDE;
 };
 
 bool CookieOSCryptoDelegate::EncryptString(const std::string& plaintext,
                                            std::string* ciphertext) {
-  return Encryptor::EncryptString(plaintext, ciphertext);
+  return OSCrypt::EncryptString(plaintext, ciphertext);
 }
 
 bool CookieOSCryptoDelegate::DecryptString(const std::string& ciphertext,
                                            std::string* plaintext) {
-  return Encryptor::DecryptString(ciphertext, plaintext);
+  return OSCrypt::DecryptString(ciphertext, plaintext);
 }
 
 // Using a LazyInstance is safe here because this class is stateless and
 // requires 0 initialization.
 base::LazyInstance<CookieOSCryptoDelegate> g_cookie_crypto_delegate =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 content::CookieCryptoDelegate* GetCookieCryptoDelegate() {
   return g_cookie_crypto_delegate.Pointer();
 }
 #else  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 content::CookieCryptoDelegate* GetCookieCryptoDelegate() {
   return NULL;
 }
 #endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 
 }  // namespace chrome_browser_net