Rename components's Encryptor to OSEncrypt.

components/autofill/core/browser/webdata/autofill_table.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 "components/autofill/core/browser/webdata/autofill_table.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <map>
@@ skipping 10 matching lines @@
 #include "base/time/time.h"
 #include "base/tuple.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/webdata/autofill_change.h"
 #include "components/autofill/core/browser/webdata/autofill_entry.h"
 #include "components/autofill/core/common/form_field_data.h"
-#include "components/encryptor/encryptor.h"
+#include "components/encryptor/os_crypt.h"
 #include "components/webdata/common/web_database.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 using base::Time;
 
 namespace autofill {
 namespace {
@@ skipping 75 matching lines @@
                                sql::Statement* s) {
   DCHECK(base::IsValidGUID(credit_card.guid()));
   int index = 0;
   s->BindString(index++, credit_card.guid());
 
   s->BindString16(index++, GetInfo(credit_card, CREDIT_CARD_NAME));
   s->BindString16(index++, GetInfo(credit_card, CREDIT_CARD_EXP_MONTH));
   s->BindString16(index++, GetInfo(credit_card, CREDIT_CARD_EXP_4_DIGIT_YEAR));
 
   std::string encrypted_data;
-  Encryptor::EncryptString16(credit_card.GetRawInfo(CREDIT_CARD_NUMBER),
-                             &encrypted_data);
+  OSCrypt::EncryptString16(credit_card.GetRawInfo(CREDIT_CARD_NUMBER),
+                           &encrypted_data);
   s->BindBlob(index++, encrypted_data.data(),
               static_cast<int>(encrypted_data.length()));
 
   s->BindInt64(index++, Time::Now().ToTimeT());
   s->BindString(index++, credit_card.origin());
 }
 
 scoped_ptr<CreditCard> CreditCardFromStatement(const sql::Statement& s) {
   scoped_ptr<CreditCard> credit_card(new CreditCard);
 
   int index = 0;
   credit_card->set_guid(s.ColumnString(index++));
   DCHECK(base::IsValidGUID(credit_card->guid()));
 
   credit_card->SetRawInfo(CREDIT_CARD_NAME, s.ColumnString16(index++));
   credit_card->SetRawInfo(CREDIT_CARD_EXP_MONTH, s.ColumnString16(index++));
   credit_card->SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR,
                           s.ColumnString16(index++));
   int encrypted_number_len = s.ColumnByteLength(index);
   base::string16 credit_card_number;
   if (encrypted_number_len) {
     std::string encrypted_number;
     encrypted_number.resize(encrypted_number_len);
     memcpy(&encrypted_number[0], s.ColumnBlob(index++), encrypted_number_len);
-    Encryptor::DecryptString16(encrypted_number, &credit_card_number);
+    OSCrypt::DecryptString16(encrypted_number, &credit_card_number);
   } else {
     index++;
   }
   credit_card->SetRawInfo(CREDIT_CARD_NUMBER, credit_card_number);
   // Intentionally skip column 5, which stores the modification date.
   index++;
   credit_card->set_origin(s.ColumnString(index++));
 
   return credit_card.Pass();
 }
@@ skipping 2027 matching lines @@
       !db_->Execute("CREATE INDEX autofill_name_value_lower ON "
                     "autofill (name, value_lower)")) {
     return false;
   }
 
 
   return transaction.Commit();
 }
 
 }  // namespace autofill