components: Rename encryptor directory to os_crypt.

Joi suggested doing this rename in a follow up CL ( https://codereview.chromium.org/183953005/diff/20001/components/encryptor/encryptor_password_mac.h#newcode16). So here it is. BUG=341293 TEST=None, no functional changes. R=joi@chromium.org,thestig@chromium.org,bcwhite@chromium.org Review URL: https://codereview.chromium.org/200713005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257573 0039d316-1c4b-4281-b951-d872f2087c98
FairyWorld · Mar 18, 2014 · c523d20 · c523d20
1 parent 77d2fa7
commit c523d20
Show file tree

Hide file tree

Showing 59 changed files with 103 additions and 103 deletions.
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
@@ -14,13 +14,13 @@ include_rules = [
   "+components/autofill/core/common",
   "+components/breakpad",
   "+components/dom_distiller",
-  "+components/encryptor",
   "+components/keyed_service",
   "+components/language_usage_metrics",
   "+components/nacl/browser",
   "+components/nacl/common",
   "+components/navigation_interception",
   "+components/navigation_metrics",
+  "+components/os_crypt",
   "+components/password_manager",
   "+components/policy",
   "+components/precache",

diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc
@@ -44,7 +44,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/common/password_form.h"
-#include "components/encryptor/ie7_password_win.h"
+#include "components/os_crypt/ie7_password_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc
@@ -19,7 +19,7 @@
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
-#include "components/encryptor/ie7_password_win.h"
+#include "components/os_crypt/ie7_password_win.h"
 #endif
 
 #include <iterator>

diff --git a/chrome/browser/net/cookie_store_util.cc b/chrome/browser/net/cookie_store_util.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/encryptor/os_crypt.h"
+#include "components/os_crypt/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"

diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc
@@ -13,8 +13,8 @@
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/encryptor/encryptor_switches.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/os_crypt/os_crypt_switches.h"
 #include "components/password_manager/core/browser/login_database.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/password_store_default.h"
@@ -148,7 +148,7 @@ KeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
 #elif defined(OS_MACOSX)
   crypto::AppleKeychain* keychain =
       CommandLine::ForCurrentProcess()->HasSwitch(
-          encryptor::switches::kUseMockKeychain) ?
+          os_crypt::switches::kUseMockKeychain) ?
           new crypto::MockAppleKeychain() : new crypto::AppleKeychain();
   ps = new PasswordStoreMac(
       main_thread_runner, db_thread_runner, keychain, login_db.release());

diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc
@@ -12,7 +12,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/webdata/web_data_service.h"
-#include "components/encryptor/ie7_password_win.h"
+#include "components/os_crypt/ie7_password_win.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "content/public/browser/browser_thread.h"
 

diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc
@@ -20,7 +20,7 @@
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/encryptor/ie7_password_win.h"
+#include "components/os_crypt/ie7_password_win.h"
 #include "components/password_manager/core/browser/password_form_data.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"

diff --git a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
@@ -26,7 +26,7 @@
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/encryptor/os_crypt.h"
+#include "components/os_crypt/os_crypt.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/browser/event_router.h"

diff --git a/chrome/browser/signin/local_auth.cc b/chrome/browser/signin/local_auth.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
-#include "components/encryptor/os_crypt.h"
+#include "components/os_crypt/os_crypt.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "crypto/random.h"
 #include "crypto/secure_util.h"

diff --git a/chrome/browser/signin/local_auth_unittest.cc b/chrome/browser/signin/local_auth_unittest.cc
@@ -12,7 +12,7 @@
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
-#include "components/encryptor/os_crypt.h"
+#include "components/os_crypt/os_crypt.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc b/chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc
@@ -19,7 +19,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_MACOSX)
-#include "components/encryptor/os_crypt.h"
+#include "components/os_crypt/os_crypt.h"
 #endif
 
 // Defining constant here to handle backward compatiblity tests, but this

diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
@@ -41,7 +41,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/encryptor/os_crypt.h"
+#include "components/os_crypt/os_crypt.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "google_apis/gaia/gaia_urls.h"

diff --git a/chrome/browser/webdata/logins_table_win.cc b/chrome/browser/webdata/logins_table_win.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "components/encryptor/ie7_password_win.h"
+#include "components/os_crypt/ie7_password_win.h"
 #include "sql/statement.h"
 
 bool LoginsTable::AddIE7Login(const IE7PasswordInfo& info) {

diff --git a/chrome/browser/webdata/web_data_service_win.cc b/chrome/browser/webdata/web_data_service_win.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "chrome/browser/webdata/logins_table.h"
-#include "components/encryptor/ie7_password_win.h"
+#include "components/os_crypt/ie7_password_win.h"
 #include "components/webdata/common/web_database_service.h"
 
 using base::Bind;

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
@@ -38,10 +38,10 @@
         '../components/component_strings.gyp:component_strings',
         '../components/components.gyp:autofill_core_browser',
         '../components/components.gyp:cloud_devices',
-        '../components/components.gyp:encryptor',
         '../components/components.gyp:navigation_metrics',
-        '../components/components.gyp:password_manager_core_common',
+        '../components/components.gyp:os_crypt',
         '../components/components.gyp:password_manager_core_browser',
+        '../components/components.gyp:password_manager_core_common',
         '../components/components.gyp:policy_component',
         '../components/components.gyp:precache_core',
         '../components/components.gyp:rappor',

diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
@@ -41,7 +41,7 @@
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/encryptor/os_crypt.h"
+#include "components/os_crypt/os_crypt.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/test/browser_test_utils.h"

diff --git a/chrome/test/base/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc
@@ -12,7 +12,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/encryptor/encryptor_switches.h"
+#include "components/os_crypt/os_crypt_switches.h"
 
 #if defined(USE_AURA)
 #include "ui/wm/core/wm_core_switches.h"
@@ -66,7 +66,7 @@ void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
 
 #if defined(OS_MACOSX)
   // Use mock keychain on mac to prevent blocking permissions dialogs.
-  command_line->AppendSwitch(encryptor::switches::kUseMockKeychain);
+  command_line->AppendSwitch(os_crypt::switches::kUseMockKeychain);
 #endif
 
   command_line->AppendSwitch(switches::kDisableComponentUpdate);

diff --git a/components/autofill.gypi b/components/autofill.gypi
@@ -103,7 +103,7 @@
         'autofill_regexes',
         'component_resources.gyp:component_resources',
         'component_strings.gyp:component_strings',
-        'encryptor',
+        'os_crypt',
         'user_prefs',
         'webdata_common',
       ],
@@ -347,7 +347,7 @@
             'autofill_regexes',
             'component_resources.gyp:component_resources',
             'component_strings.gyp:component_strings',
-            'encryptor',
+            'os_crypt',
             'user_prefs',
             'webdata_common',
           ],

diff --git a/components/autofill/core/DEPS b/components/autofill/core/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
+  "+components/os_crypt",
   # TODO(joi): Perhaps PrefRegistrySyncable should be a separate
   # component since it is currently in the same component as
   # UserPrefs, which uses content::BrowserContext.
   "+components/user_prefs/pref_registry_syncable.h",
-  "+components/encryptor",
 ]
diff --git a/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
@@ -24,7 +24,7 @@
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "components/autofill/core/browser/phone_number.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
-#include "components/encryptor/os_crypt.h"
+#include "components/os_crypt/os_crypt.h"
 
 using base::win::RegKey;
 

diff --git a/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc b/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc
@@ -10,7 +10,7 @@
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
-#include "components/encryptor/os_crypt.h"
+#include "components/os_crypt/os_crypt.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::RegKey;

diff --git a/components/autofill/core/browser/autofill_test_utils.cc b/components/autofill/core/browser/autofill_test_utils.cc
@@ -16,7 +16,7 @@
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
-#include "components/encryptor/os_crypt.h"
+#include "components/os_crypt/os_crypt.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 
 using base::ASCIIToUTF16;

diff --git a/components/autofill/core/browser/webdata/autofill_table.cc b/components/autofill/core/browser/webdata/autofill_table.cc
@@ -28,7 +28,7 @@
 #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/os_crypt.h"
+#include "components/os_crypt/os_crypt.h"
 #include "components/webdata/common/web_database.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"

diff --git a/components/autofill/core/browser/webdata/autofill_table_unittest.cc b/components/autofill/core/browser/webdata/autofill_table_unittest.cc
@@ -19,7 +19,7 @@
 #include "components/autofill/core/browser/webdata/autofill_entry.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/autofill/core/common/form_field_data.h"
-#include "components/encryptor/os_crypt.h"
+#include "components/os_crypt/os_crypt.h"
 #include "components/webdata/common/web_database.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/components/components.gyp b/components/components.gyp
@@ -15,13 +15,13 @@
     'breakpad.gypi',
     'cloud_devices.gypi',
     'dom_distiller.gypi',
-    'encryptor.gypi',
     'json_schema.gypi',
     'keyed_service.gypi',
     'language_usage_metrics.gypi',
     'metrics.gypi',
     'navigation_metrics.gypi',
     'onc.gypi',
+    'os_crypt.gypi',
     'password_manager.gypi',
     'policy.gypi',
     'precache.gypi',

diff --git a/components/components_tests.gyp b/components/components_tests.gyp
@@ -45,17 +45,15 @@
             'autofill/core/browser/password_generator_unittest.cc',
             'autofill/core/browser/personal_data_manager_unittest.cc',
             'autofill/core/browser/phone_field_unittest.cc',
-            'autofill/core/browser/phone_number_unittest.cc',
             'autofill/core/browser/phone_number_i18n_unittest.cc',
+            'autofill/core/browser/phone_number_unittest.cc',
             'autofill/core/browser/validation_unittest.cc',
             'autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc',
             'autofill/core/browser/webdata/autofill_table_unittest.cc',
             'autofill/core/browser/webdata/web_data_service_unittest.cc',
             'autofill/core/common/form_data_unittest.cc',
             'autofill/core/common/form_field_data_unittest.cc',
             'autofill/core/common/password_form_fill_data_unittest.cc',
-            'keyed_service/content/browser_context_dependency_manager_unittest.cc',
-            'keyed_service/core/dependency_graph_unittest.cc',
             'cloud_devices/printer_description_unittest.cc',
             'dom_distiller/core/article_entry_unittest.cc',
             'dom_distiller/core/distiller_unittest.cc',
@@ -69,9 +67,14 @@
             'json_schema/json_schema_validator_unittest.cc',
             'json_schema/json_schema_validator_unittest_base.cc',
             'json_schema/json_schema_validator_unittest_base.h',
+            'keyed_service/content/browser_context_dependency_manager_unittest.cc',
+            'keyed_service/core/dependency_graph_unittest.cc',
             'language_usage_metrics/language_usage_metrics_unittest.cc',
             'metrics/metrics_hashes_unittest.cc',
             'navigation_interception/intercept_navigation_resource_throttle_unittest.cc',
+            'os_crypt/ie7_password_win_unittest.cc',
+            'os_crypt/keychain_password_mac_unittest.mm',
+            'os_crypt/os_crypt_unittest.cc',
             'password_manager/core/browser/login_database_unittest.cc',
             'password_manager/core/browser/password_form_manager_unittest.cc',
             'password_manager/core/browser/password_generation_manager_unittest.cc',
@@ -121,9 +124,6 @@
             'variations/variations_seed_processor_unittest.cc',
             'variations/variations_seed_simulator_unittest.cc',
             'visitedlink/test/visitedlink_unittest.cc',
-            'encryptor/keychain_password_mac_unittest.mm',
-            'encryptor/ie7_password_unittest_win.cc',
-            'encryptor/os_crypt_unittest.cc',
             'web_modal/web_contents_modal_dialog_manager_unittest.cc',
           ],
           'include_dirs': [
@@ -165,8 +165,8 @@
             'components.gyp:dom_distiller_core',
             'components.gyp:dom_distiller_test_support',
 
-            # Dependencies of encryptor
-            'components.gyp:encryptor',
+            # Dependencies of os_crypt
+            'components.gyp:os_crypt',
 
             # Dependencies of json_schema
             'components.gyp:json_schema',

diff --git a/components/encryptor/README b/components/encryptor/README
diff --git a/components/encryptor.gypi → components/os_crypt.gypi b/components/encryptor.gypi → components/os_crypt.gypi
@@ -5,7 +5,7 @@
 {
   'targets': [
     {
-      'target_name': 'encryptor',
+      'target_name': 'os_crypt',
       'type': 'static_library',
       'include_dirs': [
         '..',
@@ -15,29 +15,29 @@
         '../crypto/crypto.gyp:crypto',
       ],
       'sources': [
-        'encryptor/encryptor_switches.cc',
-        'encryptor/encryptor_switches.h',
-        'encryptor/ie7_password_win.cc',
-        'encryptor/ie7_password_win.h',
-        'encryptor/keychain_password_mac.h',
-        'encryptor/keychain_password_mac.mm',
-        'encryptor/os_crypt.h',
-        'encryptor/os_crypt_mac.mm',
-        'encryptor/os_crypt_posix.cc',
-        'encryptor/os_crypt_win.cc',
+        'os_crypt/ie7_password_win.cc',
+        'os_crypt/ie7_password_win.h',
+        'os_crypt/keychain_password_mac.h',
+        'os_crypt/keychain_password_mac.mm',
+        'os_crypt/os_crypt.h',
+        'os_crypt/os_crypt_mac.mm',
+        'os_crypt/os_crypt_posix.cc',
+        'os_crypt/os_crypt_switches.cc',
+        'os_crypt/os_crypt_switches.h',
+        'os_crypt/os_crypt_win.cc',
       ],
       'conditions': [
         ['OS=="mac"', {
           'sources!': [
-            'encryptor/os_crypt_posix.cc',
+            'os_crypt/os_crypt_posix.cc',
           ],
         }],
       ],
       'target_conditions': [
         ['OS=="ios"', {
           'sources/': [
-            ['include', '^encryptor/keychain_password_mac\\.mm$'],
-            ['include', '^encryptor/os_crypt_mac\\.mm$'],
+            ['include', '^os_crypt/keychain_password_mac\\.mm$'],
+            ['include', '^os_crypt/os_crypt_mac\\.mm$'],
           ],
         }],
       ],

diff --git a/components/encryptor/DEPS → components/os_crypt/DEPS b/components/encryptor/DEPS → components/os_crypt/DEPS
diff --git a/components/encryptor/OWNERS → components/os_crypt/OWNERS b/components/encryptor/OWNERS → components/os_crypt/OWNERS
diff --git a/components/os_crypt/README b/components/os_crypt/README
@@ -0,0 +1,4 @@
+OSCrypt gives access to simple encryption and decryption of strings.
+
+On systems where available (currently Linux and Mac), this uses system
+services to perform the encryption/decryption.
diff --git a/components/encryptor/ie7_password_win.cc → components/os_crypt/ie7_password_win.cc b/components/encryptor/ie7_password_win.cc → components/os_crypt/ie7_password_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/encryptor/ie7_password_win.h"
+#include "components/os_crypt/ie7_password_win.h"
 
 #include <wincrypt.h>
 #include <string>