diff options
52 files changed, 110 insertions, 103 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 0329868..d65938c 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -12,6 +12,7 @@ include_rules = [ "+components/breakpad", "+components/browser_context_keyed_service", "+components/dom_distiller", + "+components/encryptor", "+components/language_usage_metrics", "+components/nacl/browser", "+components/nacl/common", @@ -30,8 +31,8 @@ include_rules = [ "+components/translate/core/common", "+components/url_matcher", "+components/user_prefs", - "+components/webdata", "+components/web_modal", + "+components/webdata/common", "+content/public/browser", "+content/test/net", "+device/bluetooth", diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc index 39f5e96..33bf646 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/webdata/encryptor/ie7_password_win.h" +#include "components/encryptor/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 79d118a..6cd4f88 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/webdata/encryptor/ie7_password_win.h" +#include "components/encryptor/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 6d90e8d..0b00984 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/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.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_win.cc b/chrome/browser/password_manager/password_store_win.cc index ada21dc..7902fec 100644 --- a/chrome/browser/password_manager/password_store_win.cc +++ b/chrome/browser/password_manager/password_store_win.cc @@ -13,7 +13,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/webdata/web_data_service.h" -#include "components/webdata/encryptor/ie7_password_win.h" +#include "components/encryptor/ie7_password_win.h" #include "content/public/browser/browser_thread.h" using autofill::PasswordForm; diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc index cd9a821..2d281a0 100644 --- a/chrome/browser/password_manager/password_store_win_unittest.cc +++ b/chrome/browser/password_manager/password_store_win_unittest.cc @@ -21,10 +21,10 @@ #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "components/encryptor/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/webdata/common/web_database_service.h" -#include "components/webdata/encryptor/ie7_password_win.h" #include "content/public/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/services/gcm/gcm_profile_service.cc b/chrome/browser/services/gcm/gcm_profile_service.cc index b58f7e6..5d0e1e5 100644 --- a/chrome/browser/services/gcm/gcm_profile_service.cc +++ b/chrome/browser/services/gcm/gcm_profile_service.cc @@ -26,7 +26,6 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "components/user_prefs/pref_registry_syncable.h" -#include "components/webdata/encryptor/encryptor.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc index 395fa14..241674e 100644 --- a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc +++ b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc @@ -25,7 +25,7 @@ #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" -#include "components/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/signin/local_auth.cc b/chrome/browser/signin/local_auth.cc index 120fd00..2bff8fb 100644 --- a/chrome/browser/signin/local_auth.cc +++ b/chrome/browser/signin/local_auth.cc @@ -14,8 +14,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" +#include "components/encryptor/encryptor.h" #include "components/user_prefs/pref_registry_syncable.h" -#include "components/webdata/encryptor/encryptor.h" #include "crypto/random.h" #include "crypto/secure_util.h" #include "crypto/symmetric_key.h" diff --git a/chrome/browser/signin/local_auth_unittest.cc b/chrome/browser/signin/local_auth_unittest.cc index 3f5d7d6..55affcc 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/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.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 993c838..6a921fb 100644 --- a/chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc +++ b/chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc @@ -18,7 +18,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_MACOSX) -#include "components/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.h" #endif // Defining constant here to handle backward compatiblity tests, but this diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc index 5be75d3..808a386 100644 --- a/chrome/browser/signin/signin_manager_unittest.cc +++ b/chrome/browser/signin/signin_manager_unittest.cc @@ -24,7 +24,6 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" -#include "components/webdata/encryptor/encryptor.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/notification_source.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index b5b0f3f..3c8e85b 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/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.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 1ca767e..5b3fcca 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/webdata/encryptor/ie7_password_win.h" +#include "components/encryptor/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 7530ada..ad34279 100644 --- a/chrome/browser/webdata/web_data_service_win.cc +++ b/chrome/browser/webdata/web_data_service_win.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "chrome/browser/webdata/logins_table.h" +#include "components/encryptor/ie7_password_win.h" #include "components/webdata/common/web_database_service.h" -#include "components/webdata/encryptor/ie7_password_win.h" using base::Bind; diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index dbfa4bc..099689b 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/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.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/components/autofill/core/DEPS b/components/autofill/core/DEPS index 778d524..07270bf 100644 --- a/components/autofill/core/DEPS +++ b/components/autofill/core/DEPS @@ -3,5 +3,5 @@ include_rules = [ # component since it is currently in the same component as # UserPrefs, which uses content::BrowserContext. "+components/user_prefs/pref_registry_syncable.h", - "+components/webdata/encryptor", + "+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 388e079..682f1917 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/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.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 61917bc..24108ec 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/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.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 0addc87..a46ed28 100644 --- a/components/autofill/core/browser/autofill_test_utils.cc +++ b/components/autofill/core/browser/autofill_test_utils.cc @@ -16,9 +16,9 @@ #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/encryptor.h" #include "components/user_prefs/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" -#include "components/webdata/encryptor/encryptor.h" #include "content/public/browser/browser_context.h" using base::ASCIIToUTF16; diff --git a/components/autofill/core/browser/personal_data_manager_unittest.cc b/components/autofill/core/browser/personal_data_manager_unittest.cc index f0d32ea..7d8194c 100644 --- a/components/autofill/core/browser/personal_data_manager_unittest.cc +++ b/components/autofill/core/browser/personal_data_manager_unittest.cc @@ -24,7 +24,6 @@ #include "components/autofill/core/common/form_data.h" #include "components/webdata/common/web_data_service_base.h" #include "components/webdata/common/web_database_service.h" -#include "components/webdata/encryptor/encryptor.h" #include "content/public/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/autofill/core/browser/webdata/autofill_table.cc b/components/autofill/core/browser/webdata/autofill_table.cc index 000521a..039942f 100644 --- a/components/autofill/core/browser/webdata/autofill_table.cc +++ b/components/autofill/core/browser/webdata/autofill_table.cc @@ -26,8 +26,8 @@ #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/webdata/common/web_database.h" -#include "components/webdata/encryptor/encryptor.h" #include "sql/statement.h" #include "sql/transaction.h" #include "ui/base/l10n/l10n_util.h" diff --git a/components/autofill/core/browser/webdata/autofill_table_unittest.cc b/components/autofill/core/browser/webdata/autofill_table_unittest.cc index 241d393..649eec3 100644 --- a/components/autofill/core/browser/webdata/autofill_table_unittest.cc +++ b/components/autofill/core/browser/webdata/autofill_table_unittest.cc @@ -19,8 +19,8 @@ #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/encryptor.h" #include "components/webdata/common/web_database.h" -#include "components/webdata/encryptor/encryptor.h" #include "sql/statement.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/components.gyp b/components/components.gyp index c65b997..d77de52 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -10,11 +10,12 @@ 'chromium_code': 1, }, 'includes': [ - 'autofill.gypi', 'auto_login_parser.gypi', + 'autofill.gypi', 'breakpad.gypi', 'cloud_devices.gypi', 'dom_distiller.gypi', + 'encryptor.gypi', 'json_schema.gypi', 'language_usage_metrics.gypi', 'metrics.gypi', diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 30a23cc..ea83ae6 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -86,9 +86,9 @@ 'variations/variations_seed_processor_unittest.cc', 'variations/variations_seed_simulator_unittest.cc', 'visitedlink/test/visitedlink_unittest.cc', - 'webdata/encryptor/encryptor_password_mac_unittest.cc', - 'webdata/encryptor/encryptor_unittest.cc', - 'webdata/encryptor/ie7_password_unittest_win.cc', + 'encryptor/encryptor_password_mac_unittest.cc', + 'encryptor/encryptor_unittest.cc', + 'encryptor/ie7_password_unittest_win.cc', 'web_modal/web_contents_modal_dialog_manager_unittest.cc', ], 'include_dirs': [ diff --git a/components/encryptor.gypi b/components/encryptor.gypi new file mode 100644 index 0000000..3050140 --- /dev/null +++ b/components/encryptor.gypi @@ -0,0 +1,44 @@ +# 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. + +{ + 'targets': [ + { + 'target_name': 'encryptor', + 'type': 'static_library', + 'include_dirs': [ + '..', + ], + 'dependencies': [ + '../base/base.gyp:base', + '../crypto/crypto.gyp:crypto', + ], + 'sources': [ + 'encryptor/encryptor.h', + 'encryptor/encryptor_mac.mm', + 'encryptor/encryptor_password_mac.h', + 'encryptor/encryptor_password_mac.mm', + 'encryptor/encryptor_posix.cc', + 'encryptor/encryptor_win.cc', + 'encryptor/ie7_password_win.cc', + 'encryptor/ie7_password_win.h', + ], + 'conditions': [ + ['OS=="mac"', { + 'sources!': [ + 'encryptor/encryptor_posix.cc', + ], + }], + ], + 'target_conditions': [ + ['OS=="ios"', { + 'sources/': [ + ['include', '^encryptor/encryptor_mac\\.mm$'], + ['include', '^encryptor/encryptor_password_mac\\.mm$'], + ], + }], + ], + }, + ], +} diff --git a/components/webdata/encryptor/DEPS b/components/encryptor/DEPS index d175bda..d175bda 100644 --- a/components/webdata/encryptor/DEPS +++ b/components/encryptor/DEPS diff --git a/components/webdata/encryptor/OWNERS b/components/encryptor/OWNERS index 1967bf5..1967bf5 100644 --- a/components/webdata/encryptor/OWNERS +++ b/components/encryptor/OWNERS diff --git a/components/webdata/encryptor/README b/components/encryptor/README index ae18586..ae18586 100644 --- a/components/webdata/encryptor/README +++ b/components/encryptor/README diff --git a/components/webdata/encryptor/encryptor.h b/components/encryptor/encryptor.h index d8f1a363..48bb2e5 100644 --- a/components/webdata/encryptor/encryptor.h +++ b/components/encryptor/encryptor.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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_WEBDATA_ENCRYPTOR_ENCRYPTOR_H_ -#define COMPONENTS_WEBDATA_ENCRYPTOR_ENCRYPTOR_H_ +#ifndef COMPONENTS_ENCRYPTOR_ENCRYPTOR_H_ +#define COMPONENTS_ENCRYPTOR_ENCRYPTOR_H_ #include <string> @@ -48,4 +48,4 @@ class Encryptor { DISALLOW_IMPLICIT_CONSTRUCTORS(Encryptor); }; -#endif // COMPONENTS_WEBDATA_ENCRYPTOR_ENCRYPTOR_H_ +#endif // COMPONENTS_ENCRYPTOR_ENCRYPTOR_H_ diff --git a/components/webdata/encryptor/encryptor_mac.mm b/components/encryptor/encryptor_mac.mm index de384db..f044c84 100644 --- a/components/webdata/encryptor/encryptor_mac.mm +++ b/components/encryptor/encryptor_mac.mm @@ -1,15 +1,15 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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 "components/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.h" #include <CommonCrypto/CommonCryptor.h> // for kCCBlockSizeAES128 #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" -#include "components/webdata/encryptor/encryptor_password_mac.h" +#include "components/encryptor/encryptor_password_mac.h" #include "crypto/apple_keychain.h" #include "crypto/encryptor.h" #include "crypto/symmetric_key.h" diff --git a/components/webdata/encryptor/encryptor_password_mac.h b/components/encryptor/encryptor_password_mac.h index f03db49..fc2a915 100644 --- a/components/webdata/encryptor/encryptor_password_mac.h +++ b/components/encryptor/encryptor_password_mac.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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_WEBDATA_ENCRYPTOR_ENCRYPTOR_PASSWORD_MAC_H_ -#define COMPONENTS_WEBDATA_ENCRYPTOR_ENCRYPTOR_PASSWORD_MAC_H_ +#ifndef COMPONENTS_ENCRYPTOR_ENCRYPTOR_PASSWORD_MAC_H_ +#define COMPONENTS_ENCRYPTOR_ENCRYPTOR_PASSWORD_MAC_H_ #include <string> @@ -32,4 +32,4 @@ class EncryptorPassword { const crypto::AppleKeychain& keychain_; }; -#endif // COMPONENTS_WEBDATA_ENCRYPTOR_ENCRYPTOR_PASSWORD_MAC_H_ +#endif // COMPONENTS_ENCRYPTOR_ENCRYPTOR_PASSWORD_MAC_H_ diff --git a/components/webdata/encryptor/encryptor_password_mac.mm b/components/encryptor/encryptor_password_mac.mm index f8178014..0cefdd5 100644 --- a/components/webdata/encryptor/encryptor_password_mac.mm +++ b/components/encryptor/encryptor_password_mac.mm @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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 "components/webdata/encryptor/encryptor_password_mac.h" +#include "components/encryptor/encryptor_password_mac.h" #import <Security/Security.h> diff --git a/components/webdata/encryptor/encryptor_password_mac_unittest.cc b/components/encryptor/encryptor_password_mac_unittest.cc index 9746222..bc95a44 100644 --- a/components/webdata/encryptor/encryptor_password_mac_unittest.cc +++ b/components/encryptor/encryptor_password_mac_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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 "components/webdata/encryptor/encryptor_password_mac.h" +#include "components/encryptor/encryptor_password_mac.h" #include "crypto/mock_apple_keychain.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/webdata/encryptor/encryptor_posix.cc b/components/encryptor/encryptor_posix.cc index a59abc5..1bcfe3d 100644 --- a/components/webdata/encryptor/encryptor_posix.cc +++ b/components/encryptor/encryptor_posix.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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 "components/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/components/webdata/encryptor/encryptor_unittest.cc b/components/encryptor/encryptor_unittest.cc index 3084ab8..2e90b1e 100644 --- a/components/webdata/encryptor/encryptor_unittest.cc +++ b/components/encryptor/encryptor_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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 "components/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.h" #include <string> diff --git a/components/webdata/encryptor/encryptor_win.cc b/components/encryptor/encryptor_win.cc index f7afa5d..6dd6673 100644 --- a/components/webdata/encryptor/encryptor_win.cc +++ b/components/encryptor/encryptor_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// 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 "components/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.h" #include <windows.h> #include <wincrypt.h> diff --git a/components/webdata/encryptor/ie7_password_unittest_win.cc b/components/encryptor/ie7_password_unittest_win.cc index adfdf3f..ee3fbf8 100644 --- a/components/webdata/encryptor/ie7_password_unittest_win.cc +++ b/components/encryptor/ie7_password_unittest_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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 "components/webdata/encryptor/ie7_password_win.h" +#include "components/encryptor/ie7_password_win.h" #include <windows.h> diff --git a/components/webdata/encryptor/ie7_password_win.cc b/components/encryptor/ie7_password_win.cc index d2d523b..cfe69f6 100644 --- a/components/webdata/encryptor/ie7_password_win.cc +++ b/components/encryptor/ie7_password_win.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "components/webdata/encryptor/ie7_password_win.h" +#include "components/encryptor/ie7_password_win.h" #include <wincrypt.h> #include <string> diff --git a/components/webdata/encryptor/ie7_password_win.h b/components/encryptor/ie7_password_win.h index 78f91c4..9c0b5d6 100644 --- a/components/webdata/encryptor/ie7_password_win.h +++ b/components/encryptor/ie7_password_win.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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_WEBDATA_ENCRYPTOR_IE7_PASSWORD_H_ -#define COMPONENTS_WEBDATA_ENCRYPTOR_IE7_PASSWORD_H_ +#ifndef COMPONENTS_ENCRYPTOR_IE7_PASSWORD_WIN_H_ +#define COMPONENTS_ENCRYPTOR_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_WEBDATA_ENCRYPTOR_IE7_PASSWORD_H_ +#endif // COMPONENTS_ENCRYPTOR_IE7_PASSWORD_WIN_H_ diff --git a/components/password_manager/DEPS b/components/password_manager/DEPS index 2555329..24b817d 100644 --- a/components/password_manager/DEPS +++ b/components/password_manager/DEPS @@ -1,7 +1,7 @@ include_rules = [ "+components/autofill/core/common", + "+components/encryptor", "+components/password_manager/core", - "+components/webdata/encryptor", "+net/base", "+sql", "+sync/api", diff --git a/components/password_manager/core/browser/login_database_win.cc b/components/password_manager/core/browser/login_database_win.cc index b350645..44a1d56 100644 --- a/components/password_manager/core/browser/login_database_win.cc +++ b/components/password_manager/core/browser/login_database_win.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/strings/string_util.h" +#include "components/encryptor/encryptor.h" #include "components/password_manager/core/browser/login_database.h" -#include "components/webdata/encryptor/encryptor.h" LoginDatabase::EncryptionResult LoginDatabase::EncryptedString( const base::string16& plain_text, diff --git a/components/signin/DEPS b/components/signin/DEPS index bfc1b22..706fbf0 100644 --- a/components/signin/DEPS +++ b/components/signin/DEPS @@ -1,6 +1,6 @@ include_rules = [ + "+components/encryptor", "+components/webdata/common", - "+components/webdata/encryptor", "+google_apis/gaia/gaia_urls.h", "+grit", # For generated headers "+net", diff --git a/components/signin/core/webdata/token_service_table.cc b/components/signin/core/webdata/token_service_table.cc index 7c73c47..bce7fe2 100644 --- a/components/signin/core/webdata/token_service_table.cc +++ b/components/signin/core/webdata/token_service_table.cc @@ -8,8 +8,8 @@ #include <string> #include "base/logging.h" +#include "components/encryptor/encryptor.h" #include "components/webdata/common/web_database.h" -#include "components/webdata/encryptor/encryptor.h" #include "sql/statement.h" namespace { diff --git a/components/sync_driver/DEPS b/components/sync_driver/DEPS index d3a3e4d..9a6972b 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/webdata/encryptor", + "+components/encryptor", "+sync", ] diff --git a/components/sync_driver/system_encryptor.cc b/components/sync_driver/system_encryptor.cc index 74d63fc..3198d6f 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/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.h" namespace browser_sync { diff --git a/components/sync_driver/system_encryptor_unittest.cc b/components/sync_driver/system_encryptor_unittest.cc index a172afa..b015004 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/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.h" #include "testing/gtest/include/gtest/gtest.h" namespace browser_sync { diff --git a/components/webdata.gypi b/components/webdata.gypi index c7ec47d..478a59c 100644 --- a/components/webdata.gypi +++ b/components/webdata.gypi @@ -5,42 +5,6 @@ { 'targets': [ { - 'target_name': 'encryptor', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../crypto/crypto.gyp:crypto', - ], - 'sources': [ - 'webdata/encryptor/encryptor.h', - 'webdata/encryptor/encryptor_mac.mm', - 'webdata/encryptor/encryptor_password_mac.h', - 'webdata/encryptor/encryptor_password_mac.mm', - 'webdata/encryptor/encryptor_posix.cc', - 'webdata/encryptor/encryptor_win.cc', - 'webdata/encryptor/ie7_password_win.cc', - 'webdata/encryptor/ie7_password_win.h', - ], - 'conditions': [ - ['OS=="mac"', { - 'sources!': [ - 'webdata/encryptor/encryptor_posix.cc', - ], - }], - ], - 'target_conditions': [ - ['OS=="ios"', { - 'sources/': [ - ['include', '^webdata/encryptor/encryptor_mac\\.mm$'], - ['include', '^webdata/encryptor/encryptor_password_mac\\.mm$'], - ], - }], - ], - }, - { 'target_name': 'webdata_common', 'type': '<(component)', 'include_dirs': [ diff --git a/google_apis/gcm/DEPS b/google_apis/gcm/DEPS index 08ac400..db06c39 100644 --- a/google_apis/gcm/DEPS +++ b/google_apis/gcm/DEPS @@ -7,7 +7,7 @@ include_rules = [ "+base", "+testing", - "+components/webdata/encryptor", + "+components/encryptor", "+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 9844f8a..efbb1f38 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/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.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 da88f26..7eab21b 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/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.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_client_impl_unittest.cc b/google_apis/gcm/gcm_client_impl_unittest.cc index f2364f4..18b41c6 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/webdata/encryptor/encryptor.h" +#include "components/encryptor/encryptor.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" |