diff options
59 files changed, 103 insertions, 103 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 0135771..cf73450 100644 --- 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 index bd36899..b04533d3c 100644 --- 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 index 6cd4f88..1ae40985 100644 --- 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 index 0ba5b0d..924c9b0 100644 --- 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 index f57b300..93ab2a1 100644 --- 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 index c50509b..c501b74 100644 --- 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 index f0ea6df..dc020d1 100644 --- 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 index 23b9d85..82afe7a 100644 --- 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 index 7f7b14c..2d36571 100644 --- 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 index 0995971..e1fd26c 100644 --- 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 index c0f72d5..18fbc51 100644 --- 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 index 3c9ca3a..7a22f0d 100644 --- 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 index 5b3fcca..bac1880 100644 --- 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 index ad34279..bcb9276 100644 --- 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 index bfecefe..63b1e37 100644 --- 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 index cdbab97..a8cd6e1 100644 --- 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 index 50c2cae..a856173 100644 --- 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 index 6bbb5b3..832ace1 100644 --- 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 index 07270bf..fe503bd 100644 --- 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 index f39fc4d..8e2b327 100644 --- 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 index 4e5c833..ed064ce 100644 --- 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 index 35f8638..2133388 100644 --- 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 index 851cfcb..6866cda 100644 --- 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 index 9a4f4a5..662b582 100644 --- 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 index d153af4..ff1222f 100644 --- 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 index 068115c..1fb6211 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -45,8 +45,8 @@ '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', @@ -54,8 +54,6 @@ '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 deleted file mode 100644 index ae18586..0000000 --- a/components/encryptor/README +++ /dev/null @@ -1,4 +0,0 @@ -Encryptor 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. diff --git a/components/encryptor.gypi b/components/os_crypt.gypi index f534a85..5965474 100644 --- a/components/encryptor.gypi +++ b/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 b/components/os_crypt/DEPS index d175bda..d175bda 100644 --- a/components/encryptor/DEPS +++ b/components/os_crypt/DEPS diff --git a/components/encryptor/OWNERS b/components/os_crypt/OWNERS index 1967bf5..1967bf5 100644 --- a/components/encryptor/OWNERS +++ b/components/os_crypt/OWNERS diff --git a/components/os_crypt/README b/components/os_crypt/README new file mode 100644 index 0000000..14bcf15 --- /dev/null +++ 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 b/components/os_crypt/ie7_password_win.cc index cfe69f6..01569b1 100644 --- a/components/encryptor/ie7_password_win.cc +++ b/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> diff --git a/components/encryptor/ie7_password_win.h b/components/os_crypt/ie7_password_win.h index 9c0b5d6..459fd92 100644 --- a/components/encryptor/ie7_password_win.h +++ b/components/os_crypt/ie7_password_win.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_ENCRYPTOR_IE7_PASSWORD_WIN_H_ -#define COMPONENTS_ENCRYPTOR_IE7_PASSWORD_WIN_H_ +#ifndef COMPONENTS_OS_CRYPT_IE7_PASSWORD_WIN_H_ +#define COMPONENTS_OS_CRYPT_IE7_PASSWORD_WIN_H_ #include <windows.h> #include <string> @@ -51,4 +51,4 @@ std::wstring GetUrlHash(const std::wstring& url); } // namespace ie7_password -#endif // COMPONENTS_ENCRYPTOR_IE7_PASSWORD_WIN_H_ +#endif // COMPONENTS_OS_CRYPT_IE7_PASSWORD_WIN_H_ diff --git a/components/encryptor/ie7_password_unittest_win.cc b/components/os_crypt/ie7_password_win_unittest.cc index ee3fbf8..a17787c 100644 --- a/components/encryptor/ie7_password_unittest_win.cc +++ b/components/os_crypt/ie7_password_win_unittest.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 <windows.h> diff --git a/components/encryptor/keychain_password_mac.h b/components/os_crypt/keychain_password_mac.h index 7cb8faf..f044f04 100644 --- a/components/encryptor/keychain_password_mac.h +++ b/components/os_crypt/keychain_password_mac.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_ENCRYPTOR_KEYCHAIN_PASSWORD_MAC_H_ -#define COMPONENTS_ENCRYPTOR_KEYCHAIN_PASSWORD_MAC_H_ +#ifndef COMPONENTS_OS_CRYPT_KEYCHAIN_PASSWORD_MAC_H_ +#define COMPONENTS_OS_CRYPT_KEYCHAIN_PASSWORD_MAC_H_ #include <string> @@ -33,4 +33,4 @@ class KeychainPassword { DISALLOW_COPY_AND_ASSIGN(KeychainPassword); }; -#endif // COMPONENTS_ENCRYPTOR_KEYCHAIN_PASSWORD_MAC_H_ +#endif // COMPONENTS_OS_CRYPT_KEYCHAIN_PASSWORD_MAC_H_ diff --git a/components/encryptor/keychain_password_mac.mm b/components/os_crypt/keychain_password_mac.mm index 7a078bf..d731cff 100644 --- a/components/encryptor/keychain_password_mac.mm +++ b/components/os_crypt/keychain_password_mac.mm @@ -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/keychain_password_mac.h" +#include "components/os_crypt/keychain_password_mac.h" #import <Security/Security.h> diff --git a/components/encryptor/keychain_password_mac_unittest.mm b/components/os_crypt/keychain_password_mac_unittest.mm index efa32b4..4e879df 100644 --- a/components/encryptor/keychain_password_mac_unittest.mm +++ b/components/os_crypt/keychain_password_mac_unittest.mm @@ -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/keychain_password_mac.h" +#include "components/os_crypt/keychain_password_mac.h" #include "crypto/mock_apple_keychain.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/encryptor/os_crypt.h b/components/os_crypt/os_crypt.h index ae899aa..a75ccf9 100644 --- a/components/encryptor/os_crypt.h +++ b/components/os_crypt/os_crypt.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_ENCRYPTOR_OS_CRYPT_H_ -#define COMPONENTS_ENCRYPTOR_OS_CRYPT_H_ +#ifndef COMPONENTS_OS_CRYPT_OS_CRYPT_H_ +#define COMPONENTS_OS_CRYPT_OS_CRYPT_H_ #include <string> @@ -45,4 +45,4 @@ class OSCrypt { DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt); }; -#endif // COMPONENTS_ENCRYPTOR_OS_CRYPT_H_ +#endif // COMPONENTS_OS_CRYPT_OS_CRYPT_H_ diff --git a/components/encryptor/os_crypt_mac.mm b/components/os_crypt/os_crypt_mac.mm index 13d6c2e..09448d7 100644 --- a/components/encryptor/os_crypt_mac.mm +++ b/components/os_crypt/os_crypt_mac.mm @@ -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/os_crypt.h" +#include "components/os_crypt/os_crypt.h" #include <CommonCrypto/CommonCryptor.h> // for kCCBlockSizeAES128 @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" -#include "components/encryptor/encryptor_switches.h" -#include "components/encryptor/keychain_password_mac.h" +#include "components/os_crypt/keychain_password_mac.h" +#include "components/os_crypt/os_crypt_switches.h" #include "crypto/apple_keychain.h" #include "crypto/encryptor.h" #include "crypto/symmetric_key.h" @@ -44,7 +44,7 @@ const char kEncryptionVersionPrefix[] = "v10"; crypto::SymmetricKey* GetEncryptionKey() { static bool mock_keychain_command_line_flag = CommandLine::ForCurrentProcess()->HasSwitch( - encryptor::switches::kUseMockKeychain); + os_crypt::switches::kUseMockKeychain); std::string password; if (use_mock_keychain || mock_keychain_command_line_flag) { diff --git a/components/encryptor/os_crypt_posix.cc b/components/os_crypt/os_crypt_posix.cc index 3dc6758..74e8db3 100644 --- a/components/encryptor/os_crypt_posix.cc +++ b/components/os_crypt/os_crypt_posix.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/os_crypt.h" +#include "components/os_crypt/os_crypt.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/components/encryptor/encryptor_switches.cc b/components/os_crypt/os_crypt_switches.cc index 7b07d18..6dffb39 100644 --- a/components/encryptor/encryptor_switches.cc +++ b/components/os_crypt/os_crypt_switches.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/encryptor/encryptor_switches.h" +#include "components/os_crypt/os_crypt_switches.h" -namespace encryptor { +namespace os_crypt { namespace switches { #if defined(OS_MACOSX) @@ -14,4 +14,4 @@ const char kUseMockKeychain[] = "use-mock-keychain"; #endif // OS_MACOSX } // namespace switches -} // namespace encryptor +} // namespace os_crypt diff --git a/components/encryptor/encryptor_switches.h b/components/os_crypt/os_crypt_switches.h index 4df069a..5529446 100644 --- a/components/encryptor/encryptor_switches.h +++ b/components/os_crypt/os_crypt_switches.h @@ -1,15 +1,15 @@ // 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. +// +#ifndef COMPONENTS_OS_CRYPT_OS_CRYPT_SWITCHES_H_ +#define COMPONENTS_OS_CRYPT_OS_CRYPT_SWITCHES_H_ // Defines all the command-line switches used by the encryptor component. -#ifndef COMPONENTS_ENCRYPTOR__ENCRYPTOR_SWITCHES_H_ -#define COMPONENTS_ENCRYPTOR__ENCRYPTOR_SWITCHES_H_ - #include "build/build_config.h" -namespace encryptor { +namespace os_crypt { namespace switches { #if defined(OS_MACOSX) @@ -21,6 +21,6 @@ extern const char kUseMockKeychain[]; #endif // OS_MACOSX } // namespace switches -} // namespace encryptor +} // namespace os_crypt -#endif // COMPONENTS_ENCRYPTOR__ENCRYPTOR_SWITCHES_H_ +#endif // COMPONENTS_OS_CRYPT_OS_CRYPT_SWITCHES_H_ diff --git a/components/encryptor/os_crypt_unittest.cc b/components/os_crypt/os_crypt_unittest.cc index fcc4d22..ef9fde0 100644 --- a/components/encryptor/os_crypt_unittest.cc +++ b/components/os_crypt/os_crypt_unittest.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/os_crypt.h" +#include "components/os_crypt/os_crypt.h" #include <string> diff --git a/components/encryptor/os_crypt_win.cc b/components/os_crypt/os_crypt_win.cc index 3853509..1f4e749 100644 --- a/components/encryptor/os_crypt_win.cc +++ b/components/os_crypt/os_crypt_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/os_crypt.h" +#include "components/os_crypt/os_crypt.h" #include <windows.h> #include <wincrypt.h> diff --git a/components/password_manager.gypi b/components/password_manager.gypi index 748536b..cb1c04b 100644 --- a/components/password_manager.gypi +++ b/components/password_manager.gypi @@ -8,13 +8,13 @@ 'target_name': 'password_manager_core_browser', 'type': 'static_library', 'dependencies': [ - 'autofill_core_common', - 'encryptor', - 'password_manager_core_common', '../base/base.gyp:base', '../net/net.gyp:net', '../sql/sql.gyp:sql', '../url/url.gyp:url_lib', + 'autofill_core_common', + 'os_crypt', + 'password_manager_core_common', ], 'include_dirs': [ '..', diff --git a/components/password_manager/DEPS b/components/password_manager/DEPS index 24b817d..6202127 100644 --- a/components/password_manager/DEPS +++ b/components/password_manager/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+components/autofill/core/common", - "+components/encryptor", + "+components/os_crypt", "+components/password_manager/core", "+net/base", "+sql", diff --git a/components/password_manager/core/browser/login_database_win.cc b/components/password_manager/core/browser/login_database_win.cc index 3479aef..b1d75a6 100644 --- a/components/password_manager/core/browser/login_database_win.cc +++ b/components/password_manager/core/browser/login_database_win.cc @@ -5,7 +5,7 @@ #include "components/password_manager/core/browser/login_database.h" #include "base/strings/string_util.h" -#include "components/encryptor/os_crypt.h" +#include "components/os_crypt/os_crypt.h" LoginDatabase::EncryptionResult LoginDatabase::EncryptedString( const base::string16& plain_text, diff --git a/components/signin.gypi b/components/signin.gypi index fa7f0fc..f3506ab 100644 --- a/components/signin.gypi +++ b/components/signin.gypi @@ -8,10 +8,10 @@ 'target_name': 'signin_core', 'type': 'static_library', 'dependencies': [ - 'encryptor', - 'webdata_common', '../base/base.gyp:base', '../sql/sql.gyp:sql', + 'os_crypt', + 'webdata_common', ], 'include_dirs': [ '..', diff --git a/components/signin/DEPS b/components/signin/DEPS index 706fbf0..eddcc27 100644 --- a/components/signin/DEPS +++ b/components/signin/DEPS @@ -1,5 +1,5 @@ include_rules = [ - "+components/encryptor", + "+components/os_crypt", "+components/webdata/common", "+google_apis/gaia/gaia_urls.h", "+grit", # For generated headers diff --git a/components/signin/core/webdata/token_service_table.cc b/components/signin/core/webdata/token_service_table.cc index a455bc7..7d51a02 100644 --- a/components/signin/core/webdata/token_service_table.cc +++ b/components/signin/core/webdata/token_service_table.cc @@ -8,7 +8,7 @@ #include <string> #include "base/logging.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" diff --git a/components/sync_driver.gypi b/components/sync_driver.gypi index 7a92c7f..f663734 100644 --- a/components/sync_driver.gypi +++ b/components/sync_driver.gypi @@ -8,9 +8,9 @@ 'target_name': 'sync_driver', 'type': 'static_library', 'dependencies': [ - 'encryptor', '../base/base.gyp:base', '../sync/sync.gyp:sync', + 'os_crypt', ], 'include_dirs': [ '..', diff --git a/components/sync_driver/DEPS b/components/sync_driver/DEPS index 9a6972b..76dfcec 100644 --- a/components/sync_driver/DEPS +++ b/components/sync_driver/DEPS @@ -1,6 +1,6 @@ include_rules = [ # SyncDriver is used by iOS, which does not use content. "-content", - "+components/encryptor", + "+components/os_crypt", "+sync", ] diff --git a/components/sync_driver/system_encryptor.cc b/components/sync_driver/system_encryptor.cc index 2a82a6c..53eaa96 100644 --- a/components/sync_driver/system_encryptor.cc +++ b/components/sync_driver/system_encryptor.cc @@ -4,7 +4,7 @@ #include "components/sync_driver/system_encryptor.h" -#include "components/encryptor/os_crypt.h" +#include "components/os_crypt/os_crypt.h" namespace browser_sync { diff --git a/components/sync_driver/system_encryptor_unittest.cc b/components/sync_driver/system_encryptor_unittest.cc index f4c9203..cee22c0 100644 --- a/components/sync_driver/system_encryptor_unittest.cc +++ b/components/sync_driver/system_encryptor_unittest.cc @@ -4,7 +4,7 @@ #include "components/sync_driver/system_encryptor.h" -#include "components/encryptor/os_crypt.h" +#include "components/os_crypt/os_crypt.h" #include "testing/gtest/include/gtest/gtest.h" namespace browser_sync { diff --git a/google_apis/gcm/DEPS b/google_apis/gcm/DEPS index db06c39..5accad6 100644 --- a/google_apis/gcm/DEPS +++ b/google_apis/gcm/DEPS @@ -7,7 +7,7 @@ include_rules = [ "+base", "+testing", - "+components/encryptor", + "+components/os_crypt", "+google", # For third_party/protobuf/src. "+net", "+third_party/leveldatabase", diff --git a/google_apis/gcm/engine/gcm_store_impl.cc b/google_apis/gcm/engine/gcm_store_impl.cc index 91d3e70..100cd57 100644 --- a/google_apis/gcm/engine/gcm_store_impl.cc +++ b/google_apis/gcm/engine/gcm_store_impl.cc @@ -17,7 +17,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/tracked_objects.h" -#include "components/encryptor/os_crypt.h" +#include "components/os_crypt/os_crypt.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" diff --git a/google_apis/gcm/engine/mcs_client_unittest.cc b/google_apis/gcm/engine/mcs_client_unittest.cc index c4ab792..5983ddd 100644 --- a/google_apis/gcm/engine/mcs_client_unittest.cc +++ b/google_apis/gcm/engine/mcs_client_unittest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/test/simple_test_clock.h" -#include "components/encryptor/os_crypt.h" +#include "components/os_crypt/os_crypt.h" #include "google_apis/gcm/base/mcs_util.h" #include "google_apis/gcm/engine/fake_connection_factory.h" #include "google_apis/gcm/engine/fake_connection_handler.h" diff --git a/google_apis/gcm/gcm.gyp b/google_apis/gcm/gcm.gyp index 75d2715..c5dfa6dd 100644 --- a/google_apis/gcm/gcm.gyp +++ b/google_apis/gcm/gcm.gyp @@ -31,7 +31,7 @@ 'dependencies': [ '../../base/base.gyp:base', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../../components/components.gyp:encryptor', + '../../components/components.gyp:os_crypt', '../../net/net.gyp:net', '../../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../../third_party/protobuf/protobuf.gyp:protobuf_lite', @@ -113,7 +113,7 @@ 'dependencies': [ '../../base/base.gyp:run_all_unittests', '../../base/base.gyp:base', - '../../components/components.gyp:encryptor', + '../../components/components.gyp:os_crypt', '../../net/net.gyp:net', '../../net/net.gyp:net_test_support', '../../testing/gtest.gyp:gtest', diff --git a/google_apis/gcm/gcm_client_impl_unittest.cc b/google_apis/gcm/gcm_client_impl_unittest.cc index 7320c00..b59023e 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/os_crypt.h" +#include "components/os_crypt/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" |