diff options
Diffstat (limited to 'components/autofill')
89 files changed, 189 insertions, 209 deletions
diff --git a/components/autofill/DEPS b/components/autofill/DEPS index 2b5c867..df74b4f 100644 --- a/components/autofill/DEPS +++ b/components/autofill/DEPS @@ -3,8 +3,8 @@ include_rules = [ "+grit", # For generated headers "+jni", "+net", + # Allow inclusion of WebKit API files. + "+third_party/WebKit/public/platform", + "+third_party/WebKit/Source/WebKit/chromium", "+ui", - # Autofill is a layered component; subdirectories must explicitly introduce - # the ability to use the content layer as appropriate. - "-content/public/common", ] diff --git a/components/autofill/README b/components/autofill/README index 6fe5dba..e7c00d4 100644 --- a/components/autofill/README +++ b/components/autofill/README @@ -4,7 +4,7 @@ to enable it to be shared cleanly on iOS. When this process is complete, this component will have the following structure: -- shared/: Shared code that does not depend on src/content/ or src/ios/ +- Top-level shared code that does not depend on src/content/ or src/ios/ - content/: Driver for the shared code based on the content layer. - browser/: Browser process code. - renderer/: Renderer process code. diff --git a/components/autofill/browser/DEPS b/components/autofill/browser/DEPS index e59d894..74e13c4 100644 --- a/components/autofill/browser/DEPS +++ b/components/autofill/browser/DEPS @@ -1,7 +1,6 @@ include_rules = [ "+components/webdata/common", "+content/public/browser", - "+content/public/common", "+crypto/random.h", "+google_apis/gaia", "+google_apis/google_api_keys.h", @@ -10,9 +9,6 @@ include_rules = [ "+sql", "+third_party/libjingle", "+third_party/libphonenumber", # For phone number i18n. - # Allow inclusion of WebKit API files. - "+third_party/WebKit/public/platform", - "+third_party/WebKit/Source/WebKit/chromium", "+webkit/plugins/webplugininfo.h", # TODO(joi): This is "ok" temporarily (it's just a header file with diff --git a/components/autofill/browser/address_field_unittest.cc b/components/autofill/browser/address_field_unittest.cc index a558693..08d9663 100644 --- a/components/autofill/browser/address_field_unittest.cc +++ b/components/autofill/browser/address_field_unittest.cc @@ -9,7 +9,7 @@ #include "components/autofill/browser/address_field.h" #include "components/autofill/browser/autofill_field.h" #include "components/autofill/browser/autofill_scanner.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "testing/gtest/include/gtest/gtest.h" namespace autofill { diff --git a/components/autofill/browser/autocomplete_history_manager.cc b/components/autofill/browser/autocomplete_history_manager.cc index e3f43bb..2f6ce63 100644 --- a/components/autofill/browser/autocomplete_history_manager.cc +++ b/components/autofill/browser/autocomplete_history_manager.cc @@ -11,9 +11,9 @@ #include "base/strings/utf_string_conversions.h" #include "components/autofill/browser/autofill_external_delegate.h" #include "components/autofill/browser/validation.h" -#include "components/autofill/shared/autofill_messages.h" -#include "components/autofill/shared/autofill_pref_names.h" -#include "components/autofill/shared/form_data.h" +#include "components/autofill/common/autofill_messages.h" +#include "components/autofill/common/autofill_pref_names.h" +#include "components/autofill/common/form_data.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/render_view_host.h" diff --git a/components/autofill/browser/autocomplete_history_manager_unittest.cc b/components/autofill/browser/autocomplete_history_manager_unittest.cc index 3153eea..0a3680d 100644 --- a/components/autofill/browser/autocomplete_history_manager_unittest.cc +++ b/components/autofill/browser/autocomplete_history_manager_unittest.cc @@ -19,7 +19,7 @@ #include "components/autofill/browser/autofill_manager.h" #include "components/autofill/browser/test_autofill_manager_delegate.h" #include "components/autofill/browser/webdata/autofill_webdata_service.h" -#include "components/autofill/shared/form_data.h" +#include "components/autofill/common/form_data.h" #include "components/webdata/common/web_data_service_test_util.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_utils.h" diff --git a/components/autofill/browser/autofill_common_test.cc b/components/autofill/browser/autofill_common_test.cc index 4a16c18..cb60e39 100644 --- a/components/autofill/browser/autofill_common_test.cc +++ b/components/autofill/browser/autofill_common_test.cc @@ -10,8 +10,8 @@ #include "chrome/browser/profiles/profile.h" #include "components/autofill/browser/autofill_profile.h" #include "components/autofill/browser/credit_card.h" -#include "components/autofill/shared/autofill_pref_names.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/autofill_pref_names.h" +#include "components/autofill/common/form_field_data.h" #include "components/user_prefs/user_prefs.h" #include "components/webdata/encryptor/encryptor.h" diff --git a/components/autofill/browser/autofill_data_model.cc b/components/autofill/browser/autofill_data_model.cc index 957451a..fa8d3ae 100644 --- a/components/autofill/browser/autofill_data_model.cc +++ b/components/autofill/browser/autofill_data_model.cc @@ -13,7 +13,7 @@ #include "components/autofill/browser/autofill_field.h" #include "components/autofill/browser/state_names.h" #include "components/autofill/browser/validation.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "googleurl/src/gurl.h" #include "grit/component_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/components/autofill/browser/autofill_download.cc b/components/autofill/browser/autofill_download.cc index c0d5a75..c2e8706 100644 --- a/components/autofill/browser/autofill_download.cc +++ b/components/autofill/browser/autofill_download.cc @@ -17,7 +17,7 @@ #include "components/autofill/browser/autofill_metrics.h" #include "components/autofill/browser/autofill_xml_parser.h" #include "components/autofill/browser/form_structure.h" -#include "components/autofill/shared/autofill_pref_names.h" +#include "components/autofill/common/autofill_pref_names.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" #include "googleurl/src/gurl.h" diff --git a/components/autofill/browser/autofill_download_unittest.cc b/components/autofill/browser/autofill_download_unittest.cc index e6b364d..7e76ad5 100644 --- a/components/autofill/browser/autofill_download_unittest.cc +++ b/components/autofill/browser/autofill_download_unittest.cc @@ -15,7 +15,7 @@ #include "components/autofill/browser/autofill_metrics.h" #include "components/autofill/browser/autofill_type.h" #include "components/autofill/browser/form_structure.h" -#include "components/autofill/shared/form_data.h" +#include "components/autofill/common/form_data.h" #include "content/public/test/test_browser_thread.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" diff --git a/components/autofill/browser/autofill_download_url.cc b/components/autofill/browser/autofill_download_url.cc index 96e44cd..e4a4b42 100644 --- a/components/autofill/browser/autofill_download_url.cc +++ b/components/autofill/browser/autofill_download_url.cc @@ -7,7 +7,7 @@ #include <string> #include "base/command_line.h" -#include "components/autofill/shared/autofill_switches.h" +#include "components/autofill/common/autofill_switches.h" #include "googleurl/src/gurl.h" namespace autofill { diff --git a/components/autofill/browser/autofill_external_delegate.cc b/components/autofill/browser/autofill_external_delegate.cc index b1fbb10..d5ac726 100644 --- a/components/autofill/browser/autofill_external_delegate.cc +++ b/components/autofill/browser/autofill_external_delegate.cc @@ -6,7 +6,7 @@ #include "components/autofill/browser/autocomplete_history_manager.h" #include "components/autofill/browser/autofill_external_delegate.h" #include "components/autofill/browser/autofill_manager.h" -#include "components/autofill/shared/autofill_messages.h" +#include "components/autofill/common/autofill_messages.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" diff --git a/components/autofill/browser/autofill_external_delegate.h b/components/autofill/browser/autofill_external_delegate.h index f1b99cc..1e1acef 100644 --- a/components/autofill/browser/autofill_external_delegate.h +++ b/components/autofill/browser/autofill_external_delegate.h @@ -12,9 +12,9 @@ #include "base/strings/string16.h" #include "components/autofill/browser/autofill_popup_delegate.h" #include "components/autofill/browser/password_autofill_manager.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/password_form_fill_data.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/password_form_fill_data.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/components/autofill/browser/autofill_external_delegate_unittest.cc b/components/autofill/browser/autofill_external_delegate_unittest.cc index a970bd6..cd011fc 100644 --- a/components/autofill/browser/autofill_external_delegate_unittest.cc +++ b/components/autofill/browser/autofill_external_delegate_unittest.cc @@ -12,9 +12,9 @@ #include "components/autofill/browser/autofill_manager.h" #include "components/autofill/browser/test_autofill_external_delegate.h" #include "components/autofill/browser/test_autofill_manager_delegate.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/password_form_fill_data.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/password_form_fill_data.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h" diff --git a/components/autofill/browser/autofill_field.h b/components/autofill/browser/autofill_field.h index 30c6620..68c3f77 100644 --- a/components/autofill/browser/autofill_field.h +++ b/components/autofill/browser/autofill_field.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/strings/string16.h" #include "components/autofill/browser/field_types.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" namespace autofill { diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/browser/autofill_manager.cc index 5fd952e..5f71055 100644 --- a/components/autofill/browser/autofill_manager.cc +++ b/components/autofill/browser/autofill_manager.cc @@ -34,15 +34,15 @@ #include "components/autofill/browser/personal_data_manager.h" #include "components/autofill/browser/phone_number.h" #include "components/autofill/browser/phone_number_i18n.h" +#include "components/autofill/common/autofill_messages.h" +#include "components/autofill/common/autofill_pref_names.h" +#include "components/autofill/common/autofill_switches.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_data_predictions.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/password_form_fill_data.h" #include "components/autofill/content/browser/autocheckout/whitelist_manager.h" #include "components/autofill/content/browser/autocheckout_manager.h" -#include "components/autofill/shared/autofill_messages.h" -#include "components/autofill/shared/autofill_pref_names.h" -#include "components/autofill/shared/autofill_switches.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_data_predictions.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/password_form_fill_data.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" diff --git a/components/autofill/browser/autofill_manager.h b/components/autofill/browser/autofill_manager.h index 9d1251b..4a35662 100644 --- a/components/autofill/browser/autofill_manager.h +++ b/components/autofill/browser/autofill_manager.h @@ -26,10 +26,10 @@ #include "components/autofill/browser/field_types.h" #include "components/autofill/browser/form_structure.h" #include "components/autofill/browser/personal_data_manager.h" +#include "components/autofill/common/autocheckout_status.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/forms_seen_state.h" #include "components/autofill/content/browser/autocheckout_manager.h" -#include "components/autofill/shared/autocheckout_status.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/forms_seen_state.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/ssl_status.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" diff --git a/components/autofill/browser/autofill_manager_unittest.cc b/components/autofill/browser/autofill_manager_unittest.cc index 7f01443..769575c 100644 --- a/components/autofill/browser/autofill_manager_unittest.cc +++ b/components/autofill/browser/autofill_manager_unittest.cc @@ -36,10 +36,10 @@ #include "components/autofill/browser/personal_data_manager.h" #include "components/autofill/browser/test_autofill_external_delegate.h" #include "components/autofill/browser/test_autofill_manager_delegate.h" -#include "components/autofill/shared/autofill_messages.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/forms_seen_state.h" +#include "components/autofill/common/autofill_messages.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/forms_seen_state.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/web_contents.h" #include "content/public/test/mock_render_process_host.h" diff --git a/components/autofill/browser/autofill_merge_unittest.cc b/components/autofill/browser/autofill_merge_unittest.cc index 63a5ebd..3a3f7cc 100644 --- a/components/autofill/browser/autofill_merge_unittest.cc +++ b/components/autofill/browser/autofill_merge_unittest.cc @@ -13,7 +13,7 @@ #include "components/autofill/browser/data_driven_test.h" #include "components/autofill/browser/form_structure.h" #include "components/autofill/browser/personal_data_manager.h" -#include "components/autofill/shared/form_data.h" +#include "components/autofill/common/form_data.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" diff --git a/components/autofill/browser/autofill_metrics.cc b/components/autofill/browser/autofill_metrics.cc index b68a502..820e939 100644 --- a/components/autofill/browser/autofill_metrics.cc +++ b/components/autofill/browser/autofill_metrics.cc @@ -9,7 +9,7 @@ #include "base/time.h" #include "components/autofill/browser/autofill_type.h" #include "components/autofill/browser/form_structure.h" -#include "components/autofill/shared/form_data.h" +#include "components/autofill/common/form_data.h" namespace autofill { diff --git a/components/autofill/browser/autofill_metrics_unittest.cc b/components/autofill/browser/autofill_metrics_unittest.cc index a5f0276..b763788 100644 --- a/components/autofill/browser/autofill_metrics_unittest.cc +++ b/components/autofill/browser/autofill_metrics_unittest.cc @@ -19,10 +19,10 @@ #include "components/autofill/browser/autofill_manager_delegate.h" #include "components/autofill/browser/autofill_metrics.h" #include "components/autofill/browser/personal_data_manager.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/forms_seen_state.h" #include "components/autofill/content/browser/autocheckout_page_meta_data.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/forms_seen_state.h" #include "components/webdata/common/web_data_results.h" #include "content/public/test/test_utils.h" #include "googleurl/src/gurl.h" diff --git a/components/autofill/browser/autofill_profile.cc b/components/autofill/browser/autofill_profile.cc index fbe0f9d..0748622 100644 --- a/components/autofill/browser/autofill_profile.cc +++ b/components/autofill/browser/autofill_profile.cc @@ -22,7 +22,7 @@ #include "components/autofill/browser/contact_info.h" #include "components/autofill/browser/phone_number.h" #include "components/autofill/browser/phone_number_i18n.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "grit/component_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/components/autofill/browser/autofill_profile_unittest.cc b/components/autofill/browser/autofill_profile_unittest.cc index 5cce31c..c42e4c4 100644 --- a/components/autofill/browser/autofill_profile_unittest.cc +++ b/components/autofill/browser/autofill_profile_unittest.cc @@ -12,7 +12,7 @@ #include "base/strings/utf_string_conversions.h" #include "components/autofill/browser/autofill_common_test.h" #include "components/autofill/browser/autofill_profile.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "grit/component_resources.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/autofill/browser/credit_card.cc b/components/autofill/browser/credit_card.cc index b15c7ac..5308daa1 100644 --- a/components/autofill/browser/credit_card.cc +++ b/components/autofill/browser/credit_card.cc @@ -22,7 +22,7 @@ #include "components/autofill/browser/autofill_type.h" #include "components/autofill/browser/field_types.h" #include "components/autofill/browser/validation.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "grit/component_resources.h" #include "grit/webkit_resources.h" #include "third_party/icu/public/common/unicode/uloc.h" diff --git a/components/autofill/browser/credit_card_field_unittest.cc b/components/autofill/browser/credit_card_field_unittest.cc index c200583..ed1ecd0 100644 --- a/components/autofill/browser/credit_card_field_unittest.cc +++ b/components/autofill/browser/credit_card_field_unittest.cc @@ -8,7 +8,7 @@ #include "components/autofill/browser/autofill_field.h" #include "components/autofill/browser/autofill_scanner.h" #include "components/autofill/browser/credit_card_field.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "testing/gtest/include/gtest/gtest.h" namespace autofill { diff --git a/components/autofill/browser/credit_card_unittest.cc b/components/autofill/browser/credit_card_unittest.cc index 12340b0..6d78f33 100644 --- a/components/autofill/browser/credit_card_unittest.cc +++ b/components/autofill/browser/credit_card_unittest.cc @@ -7,7 +7,7 @@ #include "base/strings/utf_string_conversions.h" #include "components/autofill/browser/autofill_common_test.h" #include "components/autofill/browser/credit_card.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "testing/gtest/include/gtest/gtest.h" namespace autofill { diff --git a/components/autofill/browser/form_structure.cc b/components/autofill/browser/form_structure.cc index de07af6..41647ae 100644 --- a/components/autofill/browser/form_structure.cc +++ b/components/autofill/browser/form_structure.cc @@ -21,12 +21,12 @@ #include "components/autofill/browser/autofill_xml_parser.h" #include "components/autofill/browser/field_types.h" #include "components/autofill/browser/form_field.h" +#include "components/autofill/common/autofill_constants.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_data_predictions.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/form_field_data_predictions.h" #include "components/autofill/content/browser/autocheckout_page_meta_data.h" -#include "components/autofill/shared/autofill_constants.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_data_predictions.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/form_field_data_predictions.h" #include "third_party/libjingle/source/talk/xmllite/xmlelement.h" namespace autofill { diff --git a/components/autofill/browser/form_structure.h b/components/autofill/browser/form_structure.h index 8c58c55..e654560 100644 --- a/components/autofill/browser/form_structure.h +++ b/components/autofill/browser/form_structure.h @@ -14,7 +14,7 @@ #include "components/autofill/browser/autofill_field.h" #include "components/autofill/browser/autofill_type.h" #include "components/autofill/browser/field_types.h" -#include "components/autofill/shared/web_element_descriptor.h" +#include "components/autofill/common/web_element_descriptor.h" #include "googleurl/src/gurl.h" enum RequestMethod { diff --git a/components/autofill/browser/form_structure_unittest.cc b/components/autofill/browser/form_structure_unittest.cc index 06fa0f9..05a48a2 100644 --- a/components/autofill/browser/form_structure_unittest.cc +++ b/components/autofill/browser/form_structure_unittest.cc @@ -8,9 +8,9 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "components/autofill/browser/autofill_metrics.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_field_data.h" #include "components/autofill/content/browser/autocheckout_page_meta_data.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_field_data.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" diff --git a/components/autofill/browser/name_field_unittest.cc b/components/autofill/browser/name_field_unittest.cc index 2aa90a4..9b576de 100644 --- a/components/autofill/browser/name_field_unittest.cc +++ b/components/autofill/browser/name_field_unittest.cc @@ -8,7 +8,7 @@ #include "components/autofill/browser/autofill_field.h" #include "components/autofill/browser/autofill_scanner.h" #include "components/autofill/browser/name_field.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "testing/gtest/include/gtest/gtest.h" namespace autofill { diff --git a/components/autofill/browser/password_autofill_manager.cc b/components/autofill/browser/password_autofill_manager.cc index ac8f017..55ae9a1 100644 --- a/components/autofill/browser/password_autofill_manager.cc +++ b/components/autofill/browser/password_autofill_manager.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "components/autofill/browser/password_autofill_manager.h" -#include "components/autofill/shared/autofill_messages.h" +#include "components/autofill/common/autofill_messages.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/components/autofill/browser/password_autofill_manager.h b/components/autofill/browser/password_autofill_manager.h index 89e159d..9f5bd93 100644 --- a/components/autofill/browser/password_autofill_manager.h +++ b/components/autofill/browser/password_autofill_manager.h @@ -14,7 +14,7 @@ #include <map> -#include "components/autofill/shared/password_form_fill_data.h" +#include "components/autofill/common/password_form_fill_data.h" namespace content { class WebContents; diff --git a/components/autofill/browser/personal_data_manager.cc b/components/autofill/browser/personal_data_manager.cc index e0ec1aa..6a7fb1f 100644 --- a/components/autofill/browser/personal_data_manager.cc +++ b/components/autofill/browser/personal_data_manager.cc @@ -24,7 +24,7 @@ #include "components/autofill/browser/phone_number_i18n.h" #include "components/autofill/browser/validation.h" #include "components/autofill/browser/webdata/autofill_webdata_service.h" -#include "components/autofill/shared/autofill_pref_names.h" +#include "components/autofill/common/autofill_pref_names.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" diff --git a/components/autofill/browser/personal_data_manager_unittest.cc b/components/autofill/browser/personal_data_manager_unittest.cc index 92ad889..6c20883 100644 --- a/components/autofill/browser/personal_data_manager_unittest.cc +++ b/components/autofill/browser/personal_data_manager_unittest.cc @@ -19,7 +19,7 @@ #include "components/autofill/browser/personal_data_manager.h" #include "components/autofill/browser/personal_data_manager_observer.h" #include "components/autofill/browser/webdata/autofill_webdata_service.h" -#include "components/autofill/shared/form_data.h" +#include "components/autofill/common/form_data.h" #include "components/webdata/encryptor/encryptor.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_registrar.h" diff --git a/components/autofill/browser/phone_field_unittest.cc b/components/autofill/browser/phone_field_unittest.cc index 490ab63..fc416f3 100644 --- a/components/autofill/browser/phone_field_unittest.cc +++ b/components/autofill/browser/phone_field_unittest.cc @@ -8,7 +8,7 @@ #include "components/autofill/browser/autofill_field.h" #include "components/autofill/browser/autofill_scanner.h" #include "components/autofill/browser/phone_field.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "testing/gtest/include/gtest/gtest.h" namespace autofill { diff --git a/components/autofill/browser/webdata/autofill_table.cc b/components/autofill/browser/webdata/autofill_table.cc index 62d21b5..5834f76 100644 --- a/components/autofill/browser/webdata/autofill_table.cc +++ b/components/autofill/browser/webdata/autofill_table.cc @@ -24,7 +24,7 @@ #include "components/autofill/browser/personal_data_manager.h" #include "components/autofill/browser/webdata/autofill_change.h" #include "components/autofill/browser/webdata/autofill_entry.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "components/webdata/common/web_database.h" #include "components/webdata/encryptor/encryptor.h" #include "googleurl/src/gurl.h" diff --git a/components/autofill/browser/webdata/autofill_table_unittest.cc b/components/autofill/browser/webdata/autofill_table_unittest.cc index cf321af..7c69bb5 100644 --- a/components/autofill/browser/webdata/autofill_table_unittest.cc +++ b/components/autofill/browser/webdata/autofill_table_unittest.cc @@ -18,7 +18,7 @@ #include "components/autofill/browser/webdata/autofill_change.h" #include "components/autofill/browser/webdata/autofill_entry.h" #include "components/autofill/browser/webdata/autofill_table.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "components/webdata/common/web_database.h" #include "components/webdata/encryptor/encryptor.h" #include "sql/statement.h" diff --git a/components/autofill/browser/webdata/autofill_webdata_backend_impl.cc b/components/autofill/browser/webdata/autofill_webdata_backend_impl.cc index d47c1dc..f0a79b1 100644 --- a/components/autofill/browser/webdata/autofill_webdata_backend_impl.cc +++ b/components/autofill/browser/webdata/autofill_webdata_backend_impl.cc @@ -14,7 +14,7 @@ #include "components/autofill/browser/webdata/autofill_entry.h" #include "components/autofill/browser/webdata/autofill_table.h" #include "components/autofill/browser/webdata/autofill_webdata_service_observer.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "components/webdata/common/web_data_service_backend.h" using base::Bind; diff --git a/components/autofill/browser/webdata/autofill_webdata_backend_impl.h b/components/autofill/browser/webdata/autofill_webdata_backend_impl.h index 3eaec7a..2d3abb6 100644 --- a/components/autofill/browser/webdata/autofill_webdata_backend_impl.h +++ b/components/autofill/browser/webdata/autofill_webdata_backend_impl.h @@ -11,7 +11,7 @@ #include "base/supports_user_data.h" #include "components/autofill/browser/webdata/autofill_webdata.h" #include "components/autofill/browser/webdata/autofill_webdata_backend.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "components/webdata/common/web_data_results.h" #include "components/webdata/common/web_data_service_base.h" #include "components/webdata/common/web_data_service_consumer.h" diff --git a/components/autofill/browser/webdata/autofill_webdata_service.cc b/components/autofill/browser/webdata/autofill_webdata_service.cc index c2e4a35..9aada6b 100644 --- a/components/autofill/browser/webdata/autofill_webdata_service.cc +++ b/components/autofill/browser/webdata/autofill_webdata_service.cc @@ -14,7 +14,7 @@ #include "components/autofill/browser/webdata/autofill_table.h" #include "components/autofill/browser/webdata/autofill_webdata_backend_impl.h" #include "components/autofill/browser/webdata/autofill_webdata_service_observer.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "components/webdata/common/web_data_service_backend.h" #include "components/webdata/common/web_database_service.h" diff --git a/components/autofill/browser/webdata/autofill_webdata_service.h b/components/autofill/browser/webdata/autofill_webdata_service.h index 98204e6..b861c64 100644 --- a/components/autofill/browser/webdata/autofill_webdata_service.h +++ b/components/autofill/browser/webdata/autofill_webdata_service.h @@ -12,7 +12,7 @@ #include "base/observer_list.h" #include "base/supports_user_data.h" #include "components/autofill/browser/webdata/autofill_webdata.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "components/webdata/common/web_data_results.h" #include "components/webdata/common/web_data_service_base.h" #include "components/webdata/common/web_data_service_consumer.h" diff --git a/components/autofill/browser/webdata/web_data_service_unittest.cc b/components/autofill/browser/webdata/web_data_service_unittest.cc index 7eaf284..e973f33 100644 --- a/components/autofill/browser/webdata/web_data_service_unittest.cc +++ b/components/autofill/browser/webdata/web_data_service_unittest.cc @@ -25,7 +25,7 @@ #include "components/autofill/browser/webdata/autofill_table.h" #include "components/autofill/browser/webdata/autofill_webdata_service.h" #include "components/autofill/browser/webdata/autofill_webdata_service_observer.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "components/webdata/common/web_data_service_test_util.h" #include "components/webdata/common/web_database_service.h" #include "content/public/test/test_browser_thread.h" diff --git a/components/autofill/shared/OWNERS b/components/autofill/common/OWNERS index 0c955d3..0c955d3 100644 --- a/components/autofill/shared/OWNERS +++ b/components/autofill/common/OWNERS diff --git a/components/autofill/shared/autocheckout_status.h b/components/autofill/common/autocheckout_status.h index 4b4ba53..182bba8 100644 --- a/components/autofill/shared/autocheckout_status.h +++ b/components/autofill/common/autocheckout_status.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 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. -#ifndef COMPONENTS_AUTOFILL_SHARED_AUTOCHECKOUT_STATUS_H_ -#define COMPONENTS_AUTOFILL_SHARED_AUTOCHECKOUT_STATUS_H_ +#ifndef COMPONENTS_AUTOFILL_COMMON_AUTOCHECKOUT_STATUS_H_ +#define COMPONENTS_AUTOFILL_COMMON_AUTOCHECKOUT_STATUS_H_ namespace autofill { @@ -19,4 +19,4 @@ enum AutocheckoutStatus { } // namespace autofill -#endif // COMPONENTS_AUTOFILL_SHARED_AUTOCHECKOUT_STATUS_H_ +#endif // COMPONENTS_AUTOFILL_COMMON_AUTOCHECKOUT_STATUS_H_ diff --git a/components/autofill/shared/autofill_constants.cc b/components/autofill/common/autofill_constants.cc index 359d567..f880882 100644 --- a/components/autofill/shared/autofill_constants.cc +++ b/components/autofill/common/autofill_constants.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/autofill/shared/autofill_constants.h" +#include "components/autofill/common/autofill_constants.h" #include "build/build_config.h" diff --git a/components/autofill/shared/autofill_constants.h b/components/autofill/common/autofill_constants.h index 2185cc8..44dabd1 100644 --- a/components/autofill/shared/autofill_constants.h +++ b/components/autofill/common/autofill_constants.h @@ -4,8 +4,8 @@ // Contains constants specific to the Autofill component. -#ifndef COMPONENTS_AUTOFILL_SHARED_AUTOFILL_CONSTANTS_H_ -#define COMPONENTS_AUTOFILL_SHARED_AUTOFILL_CONSTANTS_H_ +#ifndef COMPONENTS_AUTOFILL_COMMON_AUTOFILL_CONSTANTS_H_ +#define COMPONENTS_AUTOFILL_COMMON_AUTOFILL_CONSTANTS_H_ #include <stddef.h> // For size_t @@ -22,4 +22,4 @@ extern const size_t kRequiredAutofillFields; } // namespace autofill -#endif // COMPONENTS_AUTOFILL_SHARED_AUTOFILL_CONSTANTS_H_ +#endif // COMPONENTS_AUTOFILL_COMMON_AUTOFILL_CONSTANTS_H_ diff --git a/components/autofill/shared/autofill_message_generator.cc b/components/autofill/common/autofill_message_generator.cc index fe52e91..56ac7c1 100644 --- a/components/autofill/shared/autofill_message_generator.cc +++ b/components/autofill/common/autofill_message_generator.cc @@ -4,30 +4,30 @@ // Get basic type definitions. #define IPC_MESSAGE_IMPL -#include "components/autofill/shared/autofill_message_generator.h" +#include "components/autofill/common/autofill_message_generator.h" // Generate constructors. #include "ipc/struct_constructor_macros.h" -#include "components/autofill/shared/autofill_message_generator.h" +#include "components/autofill/common/autofill_message_generator.h" // Generate destructors. #include "ipc/struct_destructor_macros.h" -#include "components/autofill/shared/autofill_message_generator.h" +#include "components/autofill/common/autofill_message_generator.h" // Generate param traits write methods. #include "ipc/param_traits_write_macros.h" namespace IPC { -#include "components/autofill/shared/autofill_message_generator.h" +#include "components/autofill/common/autofill_message_generator.h" } // namespace IPC // Generate param traits read methods. #include "ipc/param_traits_read_macros.h" namespace IPC { -#include "components/autofill/shared/autofill_message_generator.h" +#include "components/autofill/common/autofill_message_generator.h" } // namespace IPC // Generate param traits log methods. #include "ipc/param_traits_log_macros.h" namespace IPC { -#include "components/autofill/shared/autofill_message_generator.h" +#include "components/autofill/common/autofill_message_generator.h" } // namespace IPC diff --git a/components/autofill/shared/autofill_message_generator.h b/components/autofill/common/autofill_message_generator.h index 36e3947..993b68d8 100644 --- a/components/autofill/shared/autofill_message_generator.h +++ b/components/autofill/common/autofill_message_generator.h @@ -4,4 +4,4 @@ // Multiply-included file, hence no include guard. -#include "components/autofill/shared/autofill_messages.h" +#include "components/autofill/common/autofill_messages.h" diff --git a/components/autofill/shared/autofill_messages.h b/components/autofill/common/autofill_messages.h index bb56602..cf1ff3d 100644 --- a/components/autofill/shared/autofill_messages.h +++ b/components/autofill/common/autofill_messages.h @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,14 +7,14 @@ #include <string> #include "base/time.h" -#include "components/autofill/shared/autocheckout_status.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_data_predictions.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/form_field_data_predictions.h" -#include "components/autofill/shared/forms_seen_state.h" -#include "components/autofill/shared/password_form_fill_data.h" -#include "components/autofill/shared/web_element_descriptor.h" +#include "components/autofill/common/autocheckout_status.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_data_predictions.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/form_field_data_predictions.h" +#include "components/autofill/common/forms_seen_state.h" +#include "components/autofill/common/password_form_fill_data.h" +#include "components/autofill/common/web_element_descriptor.h" #include "content/public/common/common_param_traits.h" #include "content/public/common/common_param_traits_macros.h" #include "content/public/common/password_form.h" diff --git a/components/autofill/shared/autofill_pref_names.cc b/components/autofill/common/autofill_pref_names.cc index 1ac035c..d6e7f9b 100644 --- a/components/autofill/shared/autofill_pref_names.cc +++ b/components/autofill/common/autofill_pref_names.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/autofill/shared/autofill_pref_names.h" +#include "components/autofill/common/autofill_pref_names.h" namespace autofill { namespace prefs { diff --git a/components/autofill/shared/autofill_pref_names.h b/components/autofill/common/autofill_pref_names.h index d6924a3..b2269fe 100644 --- a/components/autofill/shared/autofill_pref_names.h +++ b/components/autofill/common/autofill_pref_names.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_AUTOFILL_SHARED_AUTOFILL_PREF_NAMES_H_ -#define COMPONENTS_AUTOFILL_SHARED_AUTOFILL_PREF_NAMES_H_ +#ifndef COMPONENTS_AUTOFILL_COMMON_AUTOFILL_PREF_NAMES_H_ +#define COMPONENTS_AUTOFILL_COMMON_AUTOFILL_PREF_NAMES_H_ namespace autofill { namespace prefs { @@ -18,4 +18,4 @@ extern const char kAutofillPositiveUploadRate[]; } // namespace prefs } // namespace autofill -#endif // COMPONENTS_AUTOFILL_SHARED_AUTOFILL_PREF_NAMES_H_ +#endif // COMPONENTS_AUTOFILL_COMMON_AUTOFILL_PREF_NAMES_H_ diff --git a/components/autofill/shared/autofill_switches.cc b/components/autofill/common/autofill_switches.cc index 56e23ab..defb318 100644 --- a/components/autofill/shared/autofill_switches.cc +++ b/components/autofill/common/autofill_switches.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/autofill/shared/autofill_switches.h" +#include "components/autofill/common/autofill_switches.h" namespace autofill { namespace switches { diff --git a/components/autofill/shared/autofill_switches.h b/components/autofill/common/autofill_switches.h index a13a39e..5bf022f 100644 --- a/components/autofill/shared/autofill_switches.h +++ b/components/autofill/common/autofill_switches.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_AUTOFILL_SHARED_AUTOFILL_SWITCHES_H_ -#define COMPONENTS_AUTOFILL_SHARED_AUTOFILL_SWITCHES_H_ +#ifndef COMPONENTS_AUTOFILL_COMMON_AUTOFILL_SWITCHES_H_ +#define COMPONENTS_AUTOFILL_COMMON_AUTOFILL_SWITCHES_H_ namespace autofill { namespace switches { @@ -24,4 +24,4 @@ extern const char kWalletServiceUseProd[]; } // namespace switches } // namespace autofill -#endif // COMPONENTS_AUTOFILL_SHARED_AUTOFILL_SWITCHES_H_ +#endif // COMPONENTS_AUTOFILL_COMMON_AUTOFILL_SWITCHES_H_ diff --git a/components/autofill/shared/form_data.cc b/components/autofill/common/form_data.cc index 4e171eb..0b7287d 100644 --- a/components/autofill/shared/form_data.cc +++ b/components/autofill/common/form_data.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/shared/form_data.h" +#include "components/autofill/common/form_data.h" #include "base/strings/string_util.h" diff --git a/components/autofill/shared/form_data.h b/components/autofill/common/form_data.h index 462db83..6927d55 100644 --- a/components/autofill/shared/form_data.h +++ b/components/autofill/common/form_data.h @@ -1,14 +1,14 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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_AUTOFILL_SHARED_FORM_DATA_H__ -#define COMPONENTS_AUTOFILL_SHARED_FORM_DATA_H__ +#ifndef COMPONENTS_AUTOFILL_COMMON_FORM_DATA_H__ +#define COMPONENTS_AUTOFILL_COMMON_FORM_DATA_H__ #include <vector> #include "base/strings/string16.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "content/public/common/ssl_status.h" #include "googleurl/src/gurl.h" @@ -42,4 +42,4 @@ struct FormData { } // namespace autofill -#endif // COMPONENTS_AUTOFILL_SHARED_FORM_DATA_H__ +#endif // COMPONENTS_AUTOFILL_COMMON_FORM_DATA_H__ diff --git a/components/autofill/shared/form_data_predictions.cc b/components/autofill/common/form_data_predictions.cc index c2275964..a59f58a 100644 --- a/components/autofill/shared/form_data_predictions.cc +++ b/components/autofill/common/form_data_predictions.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/shared/form_data_predictions.h" +#include "components/autofill/common/form_data_predictions.h" namespace autofill { diff --git a/components/autofill/shared/form_data_predictions.h b/components/autofill/common/form_data_predictions.h index 0761c78..3e4c5bb 100644 --- a/components/autofill/shared/form_data_predictions.h +++ b/components/autofill/common/form_data_predictions.h @@ -1,15 +1,15 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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_AUTOFILL_SHARED_FORM_DATA_PREDICTIONS_H__ -#define COMPONENTS_AUTOFILL_SHARED_FORM_DATA_PREDICTIONS_H__ +#ifndef COMPONENTS_AUTOFILL_COMMON_FORM_DATA_PREDICTIONS_H__ +#define COMPONENTS_AUTOFILL_COMMON_FORM_DATA_PREDICTIONS_H__ #include <string> #include <vector> -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_field_data_predictions.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_field_data_predictions.h" namespace autofill { @@ -31,4 +31,4 @@ struct FormDataPredictions { } // namespace autofill -#endif // COMPONENTS_AUTOFILL_SHARED_FORM_DATA_PREDICTIONS_H__ +#endif // COMPONENTS_AUTOFILL_COMMON_FORM_DATA_PREDICTIONS_H__ diff --git a/components/autofill/shared/form_field_data.cc b/components/autofill/common/form_field_data.cc index 0feb5dc..6e01c32 100644 --- a/components/autofill/shared/form_field_data.cc +++ b/components/autofill/common/form_field_data.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/autofill/shared/form_field_data.h b/components/autofill/common/form_field_data.h index ec6c5ff..64f3cc28 100644 --- a/components/autofill/shared/form_field_data.h +++ b/components/autofill/common/form_field_data.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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_AUTOFILL_SHARED_FORM_FIELD_DATA_H_ -#define COMPONENTS_AUTOFILL_SHARED_FORM_FIELD_DATA_H_ +#ifndef COMPONENTS_AUTOFILL_COMMON_FORM_FIELD_DATA_H_ +#define COMPONENTS_AUTOFILL_COMMON_FORM_FIELD_DATA_H_ #include <vector> @@ -65,5 +65,5 @@ std::ostream& operator<<(std::ostream& os, const FormFieldData& field); } // namespace autofill -#endif // COMPONENTS_AUTOFILL_SHARED_FORM_FIELD_DATA_H_ +#endif // COMPONENTS_AUTOFILL_COMMON_FORM_FIELD_DATA_H_ diff --git a/components/autofill/shared/form_field_data_predictions.cc b/components/autofill/common/form_field_data_predictions.cc index 2e968ce..c83eb53 100644 --- a/components/autofill/shared/form_field_data_predictions.cc +++ b/components/autofill/common/form_field_data_predictions.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/shared/form_field_data_predictions.h" +#include "components/autofill/common/form_field_data_predictions.h" namespace autofill { diff --git a/components/autofill/shared/form_field_data_predictions.h b/components/autofill/common/form_field_data_predictions.h index 8c642c6..adff09c 100644 --- a/components/autofill/shared/form_field_data_predictions.h +++ b/components/autofill/common/form_field_data_predictions.h @@ -1,14 +1,14 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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_AUTOFILL_SHARED_FORM_FIELD_DATA_PREDICTIONS_H_ -#define COMPONENTS_AUTOFILL_SHARED_FORM_FIELD_DATA_PREDICTIONS_H_ +#ifndef COMPONENTS_AUTOFILL_COMMON_FORM_FIELD_DATA_PREDICTIONS_H_ +#define COMPONENTS_AUTOFILL_COMMON_FORM_FIELD_DATA_PREDICTIONS_H_ #include <string> #include <vector> -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" namespace autofill { @@ -27,4 +27,4 @@ struct FormFieldDataPredictions { } // namespace autofill -#endif // COMPONENTS_AUTOFILL_SHARED_FORM_FIELD_DATA_PREDICTIONS_H_ +#endif // COMPONENTS_AUTOFILL_COMMON_FORM_FIELD_DATA_PREDICTIONS_H_ diff --git a/components/autofill/shared/forms_seen_state.h b/components/autofill/common/forms_seen_state.h index da417f9..da417f9 100644 --- a/components/autofill/shared/forms_seen_state.h +++ b/components/autofill/common/forms_seen_state.h diff --git a/components/autofill/shared/password_form_fill_data.cc b/components/autofill/common/password_form_fill_data.cc index d29cc4e..99e089e 100644 --- a/components/autofill/shared/password_form_fill_data.cc +++ b/components/autofill/common/password_form_fill_data.cc @@ -1,11 +1,11 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2011 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/shared/password_form_fill_data.h" +#include "components/autofill/common/password_form_fill_data.h" #include "base/logging.h" -#include "components/autofill/shared/form_field_data.h" +#include "components/autofill/common/form_field_data.h" namespace autofill { diff --git a/components/autofill/shared/password_form_fill_data.h b/components/autofill/common/password_form_fill_data.h index 13c1b28..1c6091a 100644 --- a/components/autofill/shared/password_form_fill_data.h +++ b/components/autofill/common/password_form_fill_data.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_AUTOFILL_SHARED_PASSWORD_FORM_FILL_DATA_H_ -#define COMPONENTS_AUTOFILL_SHARED_PASSWORD_FORM_FILL_DATA_H_ +#ifndef COMPONENTS_AUTOFILL_COMMON_PASSWORD_FORM_FILL_DATA_H_ +#define COMPONENTS_AUTOFILL_COMMON_PASSWORD_FORM_FILL_DATA_H_ #include <map> #include "base/memory/scoped_ptr.h" -#include "components/autofill/shared/form_data.h" +#include "components/autofill/common/form_data.h" #include "content/public/common/password_form.h" namespace autofill { @@ -69,4 +69,4 @@ void InitPasswordFormFillData( } // namespace autofill -#endif // COMPONENTS_AUTOFILL_SHARED_PASSWORD_FORM_FILL_DATA_H__ +#endif // COMPONENTS_AUTOFILL_COMMON_PASSWORD_FORM_FILL_DATA_H__ diff --git a/components/autofill/shared/password_generation_util.cc b/components/autofill/common/password_generation_util.cc index f1ad237..31118f83 100644 --- a/components/autofill/shared/password_generation_util.cc +++ b/components/autofill/common/password_generation_util.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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/shared/password_generation_util.h" +#include "components/autofill/common/password_generation_util.h" #include "base/metrics/histogram.h" diff --git a/components/autofill/shared/password_generation_util.h b/components/autofill/common/password_generation_util.h index 4f97b77..a855958 100644 --- a/components/autofill/shared/password_generation_util.h +++ b/components/autofill/common/password_generation_util.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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_AUTOFILL_SHARED_PASSWORD_GENERATION_UTIL_H_ -#define COMPONENTS_AUTOFILL_SHARED_PASSWORD_GENERATION_UTIL_H_ +#ifndef COMPONENTS_AUTOFILL_COMMON_PASSWORD_GENERATION_UTIL_H_ +#define COMPONENTS_AUTOFILL_COMMON_PASSWORD_GENERATION_UTIL_H_ namespace autofill { namespace password_generation { @@ -74,4 +74,4 @@ enum UserAction { } // namespace password_generation } // namespace autofill -#endif // COMPONENTS_AUTOFILL_SHARED_PASSWORD_GENERATION_UTIL_H_ +#endif // COMPONENTS_AUTOFILL_COMMON_PASSWORD_GENERATION_UTIL_H_ diff --git a/components/autofill/shared/web_element_descriptor.cc b/components/autofill/common/web_element_descriptor.cc index fdc1dcb..b828778 100644 --- a/components/autofill/shared/web_element_descriptor.cc +++ b/components/autofill/common/web_element_descriptor.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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/shared/web_element_descriptor.h" +#include "components/autofill/common/web_element_descriptor.h" namespace autofill { diff --git a/components/autofill/shared/web_element_descriptor.h b/components/autofill/common/web_element_descriptor.h index bad9ef4..0e0aabf 100644 --- a/components/autofill/shared/web_element_descriptor.h +++ b/components/autofill/common/web_element_descriptor.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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_AUTOFILL_SHARED_WEB_ELEMENT_DESCRIPTOR_H_ -#define COMPONENTS_AUTOFILL_SHARED_WEB_ELEMENT_DESCRIPTOR_H_ +#ifndef COMPONENTS_AUTOFILL_COMMON_WEB_ELEMENT_DESCRIPTOR_H_ +#define COMPONENTS_AUTOFILL_COMMON_WEB_ELEMENT_DESCRIPTOR_H_ #include <string> @@ -28,4 +28,4 @@ struct WebElementDescriptor { } // namespace autofill -#endif // COMPONENTS_AUTOFILL_SHARED_WEB_ELEMENT_DESCRIPTOR_H_ +#endif // COMPONENTS_AUTOFILL_COMMON_WEB_ELEMENT_DESCRIPTOR_H_ diff --git a/components/autofill/content/DEPS b/components/autofill/content/DEPS deleted file mode 100644 index 1db9c7d..0000000 --- a/components/autofill/content/DEPS +++ /dev/null @@ -1,6 +0,0 @@ -include_rules = [ - "+content/public/common", - # Allow inclusion of WebKit API files. - "+third_party/WebKit/public/platform", - "+third_party/WebKit/Source/WebKit/chromium", -] diff --git a/components/autofill/content/browser/autocheckout/whitelist_manager.cc b/components/autofill/content/browser/autocheckout/whitelist_manager.cc index d327408..63d99e7 100644 --- a/components/autofill/content/browser/autocheckout/whitelist_manager.cc +++ b/components/autofill/content/browser/autocheckout/whitelist_manager.cc @@ -10,7 +10,7 @@ #include "base/metrics/field_trial.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "components/autofill/shared/autofill_switches.h" +#include "components/autofill/common/autofill_switches.h" #include "content/public/browser/browser_context.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" diff --git a/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc b/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc index 65cf467..dafaa04 100644 --- a/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc +++ b/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc @@ -7,8 +7,8 @@ #include "base/message_loop.h" #include "chrome/test/base/testing_profile.h" #include "components/autofill/browser/autofill_metrics.h" +#include "components/autofill/common/autofill_switches.h" #include "components/autofill/content/browser/autocheckout/whitelist_manager.h" -#include "components/autofill/shared/autofill_switches.h" #include "content/public/test/test_browser_thread_bundle.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" diff --git a/components/autofill/content/browser/autocheckout_manager.cc b/components/autofill/content/browser/autocheckout_manager.cc index 434e5fc..5a1eec3 100644 --- a/components/autofill/content/browser/autocheckout_manager.cc +++ b/components/autofill/content/browser/autocheckout_manager.cc @@ -15,11 +15,11 @@ #include "components/autofill/browser/credit_card.h" #include "components/autofill/browser/field_types.h" #include "components/autofill/browser/form_structure.h" +#include "components/autofill/common/autofill_messages.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/web_element_descriptor.h" #include "components/autofill/content/browser/autocheckout_request_manager.h" -#include "components/autofill/shared/autofill_messages.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/web_element_descriptor.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" diff --git a/components/autofill/content/browser/autocheckout_manager.h b/components/autofill/content/browser/autocheckout_manager.h index 9dae159..060fa883 100644 --- a/components/autofill/content/browser/autocheckout_manager.h +++ b/components/autofill/content/browser/autocheckout_manager.h @@ -12,8 +12,8 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "base/threading/thread_checker.h" +#include "components/autofill/common/autocheckout_status.h" #include "components/autofill/content/browser/autocheckout_page_meta_data.h" -#include "components/autofill/shared/autocheckout_status.h" class GURL; diff --git a/components/autofill/content/browser/autocheckout_manager_unittest.cc b/components/autofill/content/browser/autocheckout_manager_unittest.cc index 0146676..f55b5f4 100644 --- a/components/autofill/content/browser/autocheckout_manager_unittest.cc +++ b/components/autofill/content/browser/autocheckout_manager_unittest.cc @@ -11,9 +11,9 @@ #include "components/autofill/browser/autofill_metrics.h" #include "components/autofill/browser/form_structure.h" #include "components/autofill/browser/test_autofill_manager_delegate.h" +#include "components/autofill/common/autofill_messages.h" +#include "components/autofill/common/form_data.h" #include "components/autofill/content/browser/autocheckout_manager.h" -#include "components/autofill/shared/autofill_messages.h" -#include "components/autofill/shared/form_data.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_thread.h" diff --git a/components/autofill/content/browser/autocheckout_page_meta_data.h b/components/autofill/content/browser/autocheckout_page_meta_data.h index cea5616..a845396 100644 --- a/components/autofill/content/browser/autocheckout_page_meta_data.h +++ b/components/autofill/content/browser/autocheckout_page_meta_data.h @@ -8,7 +8,7 @@ #include <vector> #include "base/basictypes.h" -#include "components/autofill/shared/web_element_descriptor.h" +#include "components/autofill/common/web_element_descriptor.h" namespace autofill { diff --git a/components/autofill/content/browser/autocheckout_request_manager.h b/components/autofill/content/browser/autocheckout_request_manager.h index a59498e..c740c5a 100644 --- a/components/autofill/content/browser/autocheckout_request_manager.h +++ b/components/autofill/content/browser/autocheckout_request_manager.h @@ -7,9 +7,9 @@ #include "base/supports_user_data.h" #include "components/autofill/browser/autofill_metrics.h" +#include "components/autofill/common/autocheckout_status.h" #include "components/autofill/content/browser/wallet/wallet_client.h" #include "components/autofill/content/browser/wallet/wallet_client_delegate.h" -#include "components/autofill/shared/autocheckout_status.h" #include "googleurl/src/gurl.h" namespace content { diff --git a/components/autofill/content/browser/wallet/wallet_client.h b/components/autofill/content/browser/wallet/wallet_client.h index 1204909..44ab283 100644 --- a/components/autofill/content/browser/wallet/wallet_client.h +++ b/components/autofill/content/browser/wallet/wallet_client.h @@ -15,11 +15,11 @@ #include "base/values.h" #include "components/autofill/browser/autofill_manager_delegate.h" #include "components/autofill/browser/autofill_metrics.h" +#include "components/autofill/common/autocheckout_status.h" #include "components/autofill/content/browser/wallet/encryption_escrow_client.h" #include "components/autofill/content/browser/wallet/encryption_escrow_client_observer.h" #include "components/autofill/content/browser/wallet/full_wallet.h" #include "components/autofill/content/browser/wallet/wallet_items.h" -#include "components/autofill/shared/autocheckout_status.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" #include "testing/gtest/include/gtest/gtest_prod.h" diff --git a/components/autofill/content/browser/wallet/wallet_client_unittest.cc b/components/autofill/content/browser/wallet/wallet_client_unittest.cc index acf3577..109ea5fd4 100644 --- a/components/autofill/content/browser/wallet/wallet_client_unittest.cc +++ b/components/autofill/content/browser/wallet/wallet_client_unittest.cc @@ -11,13 +11,13 @@ #include "base/values.h" #include "chrome/test/base/testing_profile.h" #include "components/autofill/browser/autofill_metrics.h" +#include "components/autofill/common/autocheckout_status.h" #include "components/autofill/content/browser/wallet/full_wallet.h" #include "components/autofill/content/browser/wallet/instrument.h" #include "components/autofill/content/browser/wallet/wallet_client.h" #include "components/autofill/content/browser/wallet/wallet_client_delegate.h" #include "components/autofill/content/browser/wallet/wallet_items.h" #include "components/autofill/content/browser/wallet/wallet_test_util.h" -#include "components/autofill/shared/autocheckout_status.h" #include "content/public/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" diff --git a/components/autofill/content/browser/wallet/wallet_service_url.cc b/components/autofill/content/browser/wallet/wallet_service_url.cc index 0eab47e..a061940 100644 --- a/components/autofill/content/browser/wallet/wallet_service_url.cc +++ b/components/autofill/content/browser/wallet/wallet_service_url.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/metrics/field_trial.h" -#include "components/autofill/shared/autofill_switches.h" +#include "components/autofill/common/autofill_switches.h" #include "google_apis/gaia/gaia_urls.h" #include "googleurl/src/gurl.h" #include "net/base/url_util.h" diff --git a/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc b/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc index 8cd1031..795c79f 100644 --- a/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc +++ b/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "components/autofill/common/autofill_switches.h" #include "components/autofill/content/browser/wallet/wallet_service_url.h" -#include "components/autofill/shared/autofill_switches.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc index a28f96d..c0c1ebb 100644 --- a/components/autofill/content/renderer/autofill_agent.cc +++ b/components/autofill/content/renderer/autofill_agent.cc @@ -11,17 +11,17 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" +#include "components/autofill/common/autocheckout_status.h" +#include "components/autofill/common/autofill_constants.h" +#include "components/autofill/common/autofill_messages.h" +#include "components/autofill/common/autofill_switches.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_data_predictions.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/web_element_descriptor.h" #include "components/autofill/content/renderer/form_autofill_util.h" #include "components/autofill/content/renderer/page_click_tracker.h" #include "components/autofill/content/renderer/password_autofill_agent.h" -#include "components/autofill/shared/autocheckout_status.h" -#include "components/autofill/shared/autofill_constants.h" -#include "components/autofill/shared/autofill_messages.h" -#include "components/autofill/shared/autofill_switches.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_data_predictions.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/web_element_descriptor.h" #include "content/public/common/password_form.h" #include "content/public/common/ssl_status.h" #include "content/public/renderer/render_view.h" diff --git a/components/autofill/content/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h index 07982ce..73316a8 100644 --- a/components/autofill/content/renderer/autofill_agent.h +++ b/components/autofill/content/renderer/autofill_agent.h @@ -13,9 +13,9 @@ #include "base/memory/weak_ptr.h" #include "base/time.h" #include "base/timer.h" +#include "components/autofill/common/forms_seen_state.h" #include "components/autofill/content/renderer/form_cache.h" #include "components/autofill/content/renderer/page_click_listener.h" -#include "components/autofill/shared/forms_seen_state.h" #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" diff --git a/components/autofill/content/renderer/form_autofill_util.cc b/components/autofill/content/renderer/form_autofill_util.cc index c294633..2d96965 100644 --- a/components/autofill/content/renderer/form_autofill_util.cc +++ b/components/autofill/content/renderer/form_autofill_util.cc @@ -12,10 +12,10 @@ #include "base/metrics/field_trial.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "components/autofill/shared/autofill_switches.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/web_element_descriptor.h" +#include "components/autofill/common/autofill_switches.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/web_element_descriptor.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h" diff --git a/components/autofill/content/renderer/form_autofill_util.h b/components/autofill/content/renderer/form_autofill_util.h index aec0614..e3823b6 100644 --- a/components/autofill/content/renderer/form_autofill_util.h +++ b/components/autofill/content/renderer/form_autofill_util.h @@ -9,6 +9,9 @@ #include "base/strings/string16.h" +struct FormData; +struct FormFieldData; + namespace WebKit { class WebDocument; class WebFormElement; @@ -18,8 +21,6 @@ class WebInputElement; namespace autofill { -struct FormData; -struct FormFieldData; struct WebElementDescriptor; // A bit field mask for form or form element requirements. diff --git a/components/autofill/content/renderer/form_cache.cc b/components/autofill/content/renderer/form_cache.cc index 55161f6..6e2aad1 100644 --- a/components/autofill/content/renderer/form_cache.cc +++ b/components/autofill/content/renderer/form_cache.cc @@ -6,12 +6,12 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" +#include "components/autofill/common/autofill_constants.h" +#include "components/autofill/common/form_data.h" +#include "components/autofill/common/form_data_predictions.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/form_field_data_predictions.h" #include "components/autofill/content/renderer/form_autofill_util.h" -#include "components/autofill/shared/autofill_constants.h" -#include "components/autofill/shared/form_data.h" -#include "components/autofill/shared/form_data_predictions.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/form_field_data_predictions.h" #include "grit/component_resources.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h" diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc index e426fdd..5676472 100644 --- a/components/autofill/content/renderer/password_autofill_agent.cc +++ b/components/autofill/content/renderer/password_autofill_agent.cc @@ -8,10 +8,10 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "components/autofill/common/autofill_messages.h" +#include "components/autofill/common/form_field_data.h" +#include "components/autofill/common/password_form_fill_data.h" #include "components/autofill/content/renderer/form_autofill_util.h" -#include "components/autofill/shared/autofill_messages.h" -#include "components/autofill/shared/form_field_data.h" -#include "components/autofill/shared/password_form_fill_data.h" #include "content/public/common/password_form.h" #include "content/public/renderer/password_form_conversion_utils.h" #include "content/public/renderer/render_view.h" diff --git a/components/autofill/content/renderer/password_autofill_agent.h b/components/autofill/content/renderer/password_autofill_agent.h index fce6891..6f748c9 100644 --- a/components/autofill/content/renderer/password_autofill_agent.h +++ b/components/autofill/content/renderer/password_autofill_agent.h @@ -9,7 +9,7 @@ #include <vector> #include "base/memory/weak_ptr.h" -#include "components/autofill/shared/password_form_fill_data.h" +#include "components/autofill/common/password_form_fill_data.h" #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" diff --git a/components/autofill/content/renderer/password_generation_manager.cc b/components/autofill/content/renderer/password_generation_manager.cc index 162815a..7955917 100644 --- a/components/autofill/content/renderer/password_generation_manager.cc +++ b/components/autofill/content/renderer/password_generation_manager.cc @@ -5,8 +5,8 @@ #include "components/autofill/content/renderer/password_generation_manager.h" #include "base/logging.h" -#include "components/autofill/shared/autofill_messages.h" -#include "components/autofill/shared/password_generation_util.h" +#include "components/autofill/common/autofill_messages.h" +#include "components/autofill/common/password_generation_util.h" #include "content/public/renderer/password_form_conversion_utils.h" #include "content/public/renderer/render_view.h" #include "google_apis/gaia/gaia_urls.h" diff --git a/components/autofill/shared/DEPS b/components/autofill/shared/DEPS deleted file mode 100644 index 7b5d601..0000000 --- a/components/autofill/shared/DEPS +++ /dev/null @@ -1,11 +0,0 @@ -include_rules = [ - # TODO(blundell): Bring this list to zero. - # - # Do not add to the list of temporarily-allowed dependencies below, - # and please do not introduce more #includes of these files. - "!content/public/common/common_param_traits.h", - "!content/public/common/common_param_traits_macros.h", - "!content/public/common/password_form.h", - "!content/public/common/ssl_status.h", - "!third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h", -] |