In components/autofill, move browser/ to core/browser/

This change completes the large-scale restructuring of components/autofill into
its structure of a layered component.  This CL additionally imposes the correct
DEPS restrictions on autofill/components/core/browser/, with temporary
allowances for the current violating includes.

TBR=joi,benm,thakis,erikwright
BUG=247015

Review URL: https://chromiumcodereview.appspot.com/17392006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207403 0039d316-1c4b-4281-b951-d872f2087c98

254 files changed, 1118 insertions, 1104 deletions

diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS
index 54cca10..e8208ed 100644
--- a/android_webview/browser/DEPS
+++ b/android_webview/browser/DEPS
@@ -7,8 +7,8 @@ include_rules = [
   "+cc",
 
   "+components/auto_login_parser",
-  "+components/autofill/browser",
   "+components/autofill/content/browser",
+  "+components/autofill/core/browser",
   "+components/autofill/core/common",
   "+components/navigation_interception",
   "+components/user_prefs",
diff --git a/android_webview/browser/aw_autofill_manager_delegate.cc b/android_webview/browser/aw_autofill_manager_delegate.cc
index 69aea1b..7e288b6 100644
--- a/android_webview/browser/aw_autofill_manager_delegate.cc
+++ b/android_webview/browser/aw_autofill_manager_delegate.cc
@@ -10,8 +10,8 @@
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_builder.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/content/browser/autocheckout/whitelist_manager.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/user_prefs/user_prefs.h"
 
diff --git a/android_webview/browser/aw_autofill_manager_delegate.h b/android_webview/browser/aw_autofill_manager_delegate.h
index b1635d2..8c7b3e3 100644
--- a/android_webview/browser/aw_autofill_manager_delegate.h
+++ b/android_webview/browser/aw_autofill_manager_delegate.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service_builder.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
 
 namespace autofill {
 class AutofillMetrics;
diff --git a/android_webview/browser/aw_form_database_service.cc b/android_webview/browser/aw_form_database_service.cc
index 4fa8b40..2b168de 100644
--- a/android_webview/browser/aw_form_database_service.cc
+++ b/android_webview/browser/aw_form_database_service.cc
@@ -4,7 +4,7 @@
 
 #include "android_webview/browser/aw_form_database_service.h"
 #include "base/logging.h"
-#include "components/autofill/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/webdata/common/webdata_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/l10n/l10n_util_android.h"
diff --git a/android_webview/browser/aw_form_database_service.h b/android_webview/browser/aw_form_database_service.h
index cb66d4e..c1cbc37 100644
--- a/android_webview/browser/aw_form_database_service.h
+++ b/android_webview/browser/aw_form_database_service.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/synchronization/waitable_event.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/webdata/common/web_data_service_consumer.h"
 #include "components/webdata/common/web_database_service.h"
 
diff --git a/android_webview/browser/aw_form_database_service_unittest.cc b/android_webview/browser/aw_form_database_service_unittest.cc
index c9bebf6..2a08c1f 100644
--- a/android_webview/browser/aw_form_database_service_unittest.cc
+++ b/android_webview/browser/aw_form_database_service_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/android_webview/native/DEPS b/android_webview/native/DEPS
index a5e0d79..2622847 100644
--- a/android_webview/native/DEPS
+++ b/android_webview/native/DEPS
@@ -3,8 +3,8 @@ include_rules = [
   "+ui/gfx",
 
   # Components that Android WebView depends on.
-  "+components/autofill/browser",
   "+components/autofill/content/browser",
+  "+components/autofill/core/browser",
   "+components/navigation_interception",
   "+components/web_contents_delegate_android",
 ]
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 333f8dc..931e37c 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -28,9 +28,9 @@
 #include "base/pickle.h"
 #include "base/strings/string16.h"
 #include "base/supports_user_data.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/android_webview/native/aw_form_database.cc b/android_webview/native/aw_form_database.cc
index 5ebdf12..3e946ec 100644
--- a/android_webview/native/aw_form_database.cc
+++ b/android_webview/native/aw_form_database.cc
@@ -10,7 +10,7 @@
 #include "base/android/jni_android.h"
 #include "base/logging.h"
 #include "base/time.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "jni/AwFormDatabase_jni.h"
 
 // static
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index 9b45e64..35a5cb5 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -12,7 +12,6 @@
       'dependencies': [
         '../../base/base.gyp:base_static',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../../components/components.gyp:autofill_browser',
         '../../components/components.gyp:autofill_content_browser',
         '../../components/components.gyp:web_contents_delegate_android',
         '../../cc/cc.gyp:cc',
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index b9c6a71..74995a0 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -5,8 +5,8 @@ include_rules = [
   "+chrome/installer",
   "+chrome/tools/profiles",  # For history unit tests.
   "+chromeos",
-  "+components/autofill/browser",
   "+components/autofill/content/browser",
+  "+components/autofill/core/browser",
   "+components/autofill/core/common",
   "+components/auto_login_parser",
   "+components/breakpad",
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index b388f5a..7bd9e40 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -28,7 +28,7 @@
 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
 #include "chrome/browser/ui/android/validation_message_bubble_android.h"
 #include "chrome/browser/ui/android/website_settings_popup_android.h"
-#include "components/autofill/browser/android/component_jni_registrar.h"
+#include "components/autofill/core/browser/android/component_jni_registrar.h"
 #include "components/navigation_interception/component_jni_registrar.h"
 #include "components/web_contents_delegate_android/component_jni_registrar.h"
 
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc
index 802dc41..a853f92 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 #include "jni/PersonalDataManager_jni.h"
 
 using base::android::ConvertJavaStringToUTF8;
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.h b/chrome/browser/autofill/android/personal_data_manager_android.h
index 1809b07..6221f8a 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.h
+++ b/chrome/browser/autofill/android/personal_data_manager_android.h
@@ -7,8 +7,8 @@
 
 #include "base/android/jni_helper.h"
 #include "base/android/scoped_java_ref.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/personal_data_manager_observer.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
 
 namespace autofill {
 
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index d2d213f..181554a 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -27,16 +27,16 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_external_delegate.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/autofill_manager_test_delegate.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/personal_data_manager_observer.h"
-#include "components/autofill/browser/validation.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_external_delegate.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autofill_manager_test_delegate.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
+#include "components/autofill/core/browser/validation.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc
index 185b283..a55a4d0 100644
--- a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc
+++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc
@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.h b/chrome/browser/autofill/autofill_cc_infobar_delegate.h
index 14c959a..4941864 100644
--- a/chrome/browser/autofill/autofill_cc_infobar_delegate.h
+++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.h
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
-#include "components/autofill/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "ui/base/window_open_disposition.h"
 
 class CreditCard;
diff --git a/chrome/browser/autofill/autofill_external_delegate_browsertest.cc b/chrome/browser/autofill/autofill_external_delegate_browsertest.cc
index 16e7611..e06e046 100644
--- a/chrome/browser/autofill/autofill_external_delegate_browsertest.cc
+++ b/chrome/browser/autofill/autofill_external_delegate_browsertest.cc
@@ -10,10 +10,10 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/test_autofill_driver.h"
-#include "components/autofill/browser/test_autofill_external_delegate.h"
-#include "components/autofill/browser/test_autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/test_autofill_driver.h"
+#include "components/autofill/core/browser/test_autofill_external_delegate.h"
+#include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc
index 2199cb5..fc6e924 100644
--- a/chrome/browser/autofill/autofill_interactive_uitest.cc
+++ b/chrome/browser/autofill/autofill_interactive_uitest.cc
@@ -11,14 +11,14 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_external_delegate.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/autofill_manager_test_delegate.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/personal_data_manager_observer.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_external_delegate.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autofill_manager_test_delegate.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc
index e4491ab..b354925 100644
--- a/chrome/browser/autofill/form_structure_browsertest.cc
+++ b/chrome/browser/autofill/form_structure_browsertest.cc
@@ -11,10 +11,10 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/data_driven_test.h"
-#include "components/autofill/browser/form_structure.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/data_driven_test.h"
+#include "components/autofill/core/browser/form_structure.h"
 #include "googleurl/src/gurl.h"
 
 namespace autofill {
diff --git a/chrome/browser/autofill/personal_data_manager_factory.cc b/chrome/browser/autofill/personal_data_manager_factory.cc
index 5157fe2..17b234e 100644
--- a/chrome/browser/autofill/personal_data_manager_factory.cc
+++ b/chrome/browser/autofill/personal_data_manager_factory.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
-#include "components/autofill/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 
 namespace autofill {
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index cd98c08..ac7ad28 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -26,7 +26,7 @@
 #include "chrome/browser/common/cancelable_request.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/content_settings.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/trace_subscriber.h"
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h
index 9d7406d..5ecae7b 100644
--- a/chrome/browser/automation/automation_provider_observers.h
+++ b/chrome/browser/automation/automation_provider_observers.h
@@ -20,8 +20,8 @@
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/personal_data_manager_observer.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index e0799e1..27e6eed 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -45,8 +45,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/download_manager.h"
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index a996a1e..43cce41 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -26,11 +26,11 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/personal_data_manager_observer.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/storage_partition.h"
diff --git a/chrome/browser/password_manager/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc
index 1bf3d7d..3f30ac1 100644
--- a/chrome/browser/password_manager/password_form_manager.cc
+++ b/chrome/browser/password_manager/password_form_manager.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "components/autofill/browser/validation.h"
+#include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/password_manager/password_generation_manager.cc b/chrome/browser/password_manager/password_generation_manager.cc
index 4742d21..4c8051b 100644
--- a/chrome/browser/password_manager/password_generation_manager.cc
+++ b/chrome/browser/password_manager/password_generation_manager.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/pref_names.h"
-#include "components/autofill/browser/password_generator.h"
+#include "components/autofill/core/browser/password_generator.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/password_manager/password_manager_delegate_impl.cc b/chrome/browser/password_manager/password_manager_delegate_impl.cc
index 822f983..eeb9943 100644
--- a/chrome/browser/password_manager/password_manager_delegate_impl.cc
+++ b/chrome/browser/password_manager/password_manager_delegate_impl.cc
@@ -13,8 +13,8 @@
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
-#include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
+#include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 82199f4..8054dd6 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -90,7 +90,7 @@
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/metrics/entropy_provider.h"
 #include "chrome/common/pref_names.h"
-#include "components/autofill/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autofill_manager.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/render_process_host.h"
 
diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.cc b/chrome/browser/sync/glue/autofill_data_type_controller.cc
index 6703779..3c8f0cf 100644
--- a/chrome/browser/sync/glue/autofill_data_type_controller.cc
+++ b/chrome/browser/sync/glue/autofill_data_type_controller.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/sync_error.h"
 #include "sync/internal_api/public/util/experiments.h"
diff --git a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
index ce020f9..a52c3a4 100644
--- a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
@@ -19,7 +19,7 @@
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/profile_mock.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/webdata/common/web_data_service_test_util.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
diff --git a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc
index a508a84..e089532 100644
--- a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc
+++ b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc
@@ -10,8 +10,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_components_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/sync_error.h"
 #include "sync/api/syncable_service.h"
diff --git a/chrome/browser/sync/glue/autofill_profile_data_type_controller.h b/chrome/browser/sync/glue/autofill_profile_data_type_controller.h
index 3e00748..b4a175e 100644
--- a/chrome/browser/sync/glue/autofill_profile_data_type_controller.h
+++ b/chrome/browser/sync/glue/autofill_profile_data_type_controller.h
@@ -9,7 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/sync/glue/non_ui_data_type_controller.h"
-#include "components/autofill/browser/personal_data_manager_observer.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
 
 namespace autofill {
 class PersonalDataManager;
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 5c997c3..cd87e9d 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -55,7 +55,7 @@
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/syncable_service.h"
 
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.h b/chrome/browser/sync/profile_sync_components_factory_impl.h
index 03295c2..2de940b 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.h
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/sync/profile_sync_components_factory.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 
 
 class CommandLine;
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
index 8fa2fea..2f9752c 100644
--- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
@@ -38,12 +38,12 @@
 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#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/browser/webdata/autofill_table.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/webdata/common/web_data_service_test_util.h"
 #include "components/webdata/common/web_database.h"
 #include "content/public/test/test_browser_thread.h"
diff --git a/chrome/browser/sync/test/integration/autofill_helper.cc b/chrome/browser/sync/test/integration/autofill_helper.cc
index 944e8fa..bc9bf3e 100644
--- a/chrome/browser/sync/test/integration/autofill_helper.cc
+++ b/chrome/browser/sync/test/integration/autofill_helper.cc
@@ -11,14 +11,14 @@
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/personal_data_manager_observer.h"
-#include "components/autofill/browser/webdata/autofill_entry.h"
-#include "components/autofill/browser/webdata/autofill_table.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/webdata/common/web_database.h"
 
diff --git a/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc
index 5f97f2b..49d79ad 100644
--- a/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc
+++ b/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc
@@ -9,9 +9,9 @@
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
 
 using autofill::AutofillFieldType;
 using autofill::AutofillKey;
diff --git a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
index 412ffa9..49ea529 100644
--- a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
@@ -7,11 +7,11 @@
 #include "chrome/browser/sync/test/integration/autofill_helper.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/webdata/autofill_entry.h"
-#include "components/autofill/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
 
 using autofill::AutofillKey;
 using autofill::AutofillTable;
diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc b/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc
index b5bd7f0..0b1d0dc 100644
--- a/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc
+++ b/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/android/autofill/autofill_dialog_view_android.h"
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ -11,9 +12,9 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/android/window_android_helper.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/credit_card.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/credit_card.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "jni/AutofillDialogGlue_jni.h"
diff --git a/chrome/browser/ui/autofill/account_chooser_model.cc b/chrome/browser/ui/autofill/account_chooser_model.cc
index be5f630..7def50a 100644
--- a/chrome/browser/ui/autofill/account_chooser_model.cc
+++ b/chrome/browser/ui/autofill/account_chooser_model.cc
@@ -11,7 +11,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "chrome/common/pref_names.h"
-#include "components/autofill/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/autofill/account_chooser_model.h b/chrome/browser/ui/autofill/account_chooser_model.h
index 940dccd..fd3f001 100644
--- a/chrome/browser/ui/autofill/account_chooser_model.h
+++ b/chrome/browser/ui/autofill/account_chooser_model.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
 #include "ui/base/models/simple_menu_model.h"
 
 class AutofillMetrics;
diff --git a/chrome/browser/ui/autofill/account_chooser_model_unittest.cc b/chrome/browser/ui/autofill/account_chooser_model_unittest.cc
index 16f4010..f27c1be 100644
--- a/chrome/browser/ui/autofill/account_chooser_model_unittest.cc
+++ b/chrome/browser/ui/autofill/account_chooser_model_unittest.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/ui/autofill/account_chooser_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/ui/autofill/autocheckout_bubble_controller.cc b/chrome/browser/ui/autofill/autocheckout_bubble_controller.cc
index d3cab37..2fc1d14 100644
--- a/chrome/browser/ui/autofill/autocheckout_bubble_controller.cc
+++ b/chrome/browser/ui/autofill/autocheckout_bubble_controller.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ui/autofill/autocheckout_bubble_controller.h"
 
-#include "components/autofill/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/autofill/autocheckout_bubble_controller_unittest.cc b/chrome/browser/ui/autofill/autocheckout_bubble_controller_unittest.cc
index d7ed4e0..ca353ad 100644
--- a/chrome/browser/ui/autofill/autocheckout_bubble_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autocheckout_bubble_controller_unittest.cc
@@ -6,7 +6,7 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/autofill/autocheckout_bubble_controller.h"
-#include "components/autofill/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller.h b/chrome/browser/ui/autofill/autofill_dialog_controller.h
index f7c5ddb..05e6b898 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller.h
@@ -9,8 +9,8 @@
 
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
-#include "components/autofill/browser/field_types.h"
 #include "components/autofill/content/browser/wallet/required_action.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "ui/base/range/range.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
index 7a33c36..8a53f47 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
@@ -15,11 +15,11 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/test_personal_data_manager.h"
-#include "components/autofill/browser/validation.h"
 #include "components/autofill/content/browser/wallet/wallet_test_util.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/test_personal_data_manager.h"
+#include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
index caa7fcc..aa3e09c 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
@@ -34,13 +34,6 @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_data_model.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/phone_number_i18n.h"
-#include "components/autofill/browser/validation.h"
 #include "components/autofill/content/browser/risk/fingerprint.h"
 #include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
 #include "components/autofill/content/browser/wallet/form_field_error.h"
@@ -50,6 +43,13 @@
 #include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "components/autofill/content/browser/wallet/wallet_service_url.h"
 #include "components/autofill/content/browser/wallet/wallet_signin_helper.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_data_model.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/phone_number_i18n.h"
+#include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index 2748ec3..0bfa077 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -19,17 +19,17 @@
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/country_combobox_model.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/autofill_popup_delegate.h"
-#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/browser/personal_data_manager_observer.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_signin_helper_delegate.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_popup_delegate.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/form_structure.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/ssl_status.h"
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
index 8aa1d030..834fe00 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -16,9 +16,6 @@
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/test_personal_data_manager.h"
 #include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 #include "components/autofill/content/browser/wallet/instrument.h"
@@ -26,6 +23,9 @@
 #include "components/autofill/content/browser/wallet/wallet_client.h"
 #include "components/autofill/content/browser/wallet/wallet_service_url.h"
 #include "components/autofill/content/browser/wallet/wallet_test_util.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/test_personal_data_manager.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/autofill/core/common/form_data.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/autofill/autofill_dialog_models.cc b/chrome/browser/ui/autofill/autofill_dialog_models.cc
index 89b76b0..e578bec 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_models.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_models.cc
@@ -11,7 +11,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "chrome/common/pref_names.h"
-#include "components/autofill/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_country.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/autofill/autofill_dialog_types.h b/chrome/browser/ui/autofill/autofill_dialog_types.h
index d18eca1..944cf2c4 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_types.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_types.h
@@ -10,8 +10,8 @@
 
 #include "base/callback_forward.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc
index f9bd96b..3c4c6b0 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc
@@ -9,9 +9,9 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/test_autofill_external_delegate.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/test_autofill_external_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
index 7ba2d93..35fb0ef 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
-#include "components/autofill/browser/autofill_popup_delegate.h"
+#include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "grit/webkit_resources.h"
 #include "third_party/WebKit/public/web/WebAutofillClient.h"
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
index f64cfb4..b032268 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
@@ -10,11 +10,11 @@
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autofill_external_delegate.h"
-#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/content/browser/autofill_driver_impl.h"
+#include "components/autofill/core/browser/autofill_external_delegate.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/test_autofill_external_delegate.h"
+#include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebAutofillClient.h"
diff --git a/chrome/browser/ui/autofill/country_combobox_model.cc b/chrome/browser/ui/autofill/country_combobox_model.cc
index fe2eab2..6079e02 100644
--- a/chrome/browser/ui/autofill/country_combobox_model.cc
+++ b/chrome/browser/ui/autofill/country_combobox_model.cc
@@ -6,7 +6,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "components/autofill/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_country.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 
 namespace autofill {
diff --git a/chrome/browser/ui/autofill/data_model_wrapper.cc b/chrome/browser/ui/autofill/data_model_wrapper.cc
index 4487650..618a22e 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper.cc
+++ b/chrome/browser/ui/autofill/data_model_wrapper.cc
@@ -8,15 +8,15 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
-#include "components/autofill/browser/autofill_data_model.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/form_structure.h"
-#include "components/autofill/browser/validation.h"
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 #include "components/autofill/content/browser/wallet/wallet_address.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
+#include "components/autofill/core/browser/autofill_data_model.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/form_structure.h"
+#include "components/autofill/core/browser/validation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
diff --git a/chrome/browser/ui/autofill/data_model_wrapper.h b/chrome/browser/ui/autofill/data_model_wrapper.h
index a9302de..4881aac 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper.h
+++ b/chrome/browser/ui/autofill/data_model_wrapper.h
@@ -8,8 +8,8 @@
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
-#include "components/autofill/browser/field_types.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace gfx {
 class Image;
diff --git a/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc b/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
index 144a6c9f8..88db683 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
+++ b/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
@@ -6,12 +6,12 @@
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/field_types.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "components/autofill/content/browser/wallet/wallet_test_util.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#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 "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h
index 9864f1d..2be7cbc 100644
--- a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h
+++ b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h
@@ -10,7 +10,7 @@
 #include "base/i18n/rtl.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index bd3f7bf..d6d87e3 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -190,7 +190,7 @@
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/view_ids.h"
-#include "components/autofill/browser/autofill_ie_toolbar_import_win.h"
+#include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/win/hwnd_util.h"
 #endif  // OS_WIN
diff --git a/chrome/browser/ui/browser_tab_contents.cc b/chrome/browser/ui/browser_tab_contents.cc
index 56d3204..6d4d335 100644
--- a/chrome/browser/ui/browser_tab_contents.cc
+++ b/chrome/browser/ui/browser_tab_contents.cc
@@ -42,8 +42,8 @@
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
+#include "components/autofill/core/browser/autofill_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/view_type_utils.h"
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
index f2394f1..995ac55 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
@@ -10,7 +10,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "components/autofill/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
 #include "components/autofill/core/common/form_data.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
diff --git a/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm
index 162b954..4662fc6 100644
--- a/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm
@@ -13,7 +13,7 @@
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #import "chrome/browser/ui/cocoa/styled_text_field_cell.h"
-#include "components/autofill/browser/password_generator.h"
+#include "components/autofill/core/browser/password_generator.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "components/autofill/core/common/password_generation_util.h"
 #include "content/public/browser/render_view_host.h"
diff --git a/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller_unittest.mm
index 0e93aa6..f5c3db8 100644
--- a/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller_unittest.mm
@@ -10,7 +10,7 @@
 #include "base/metrics/statistics_recorder.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
-#include "components/autofill/browser/password_generator.h"
+#include "components/autofill/core/browser/password_generator.h"
 #include "content/public/common/password_form.h"
 #include "testing/gtest_mac.h"
 
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_cocoa_browsertest.mm
index 8577dfe..831f1d0 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa_browsertest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa_browsertest.mm
@@ -13,7 +13,7 @@
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "components/autofill/browser/password_generator.h"
+#include "components/autofill/core/browser/password_generator.h"
 #include "content/public/common/password_form.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
diff --git a/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc b/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc
index 70be410..5086b87 100644
--- a/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/password_generation_bubble_gtk.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/url_constants.h"
-#include "components/autofill/browser/password_generator.h"
+#include "components/autofill/core/browser/password_generator.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
index 53669c4..23df6d7 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_sign_in_delegate.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
-#include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/content/browser/wallet/wallet_service_url.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/native_web_keyboard_event.h"
diff --git a/chrome/browser/ui/views/password_generation_bubble_view.cc b/chrome/browser/ui/views/password_generation_bubble_view.cc
index 0c45d3f..cab4c79 100644
--- a/chrome/browser/ui/views/password_generation_bubble_view.cc
+++ b/chrome/browser/ui/views/password_generation_bubble_view.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/url_constants.h"
-#include "components/autofill/browser/password_generator.h"
+#include "components/autofill/core/browser/password_generator.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "components/autofill/core/common/password_generation_util.h"
 #include "content/public/browser/page_navigator.h"
diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
index 09d7e16..f32e43b 100644
--- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
+++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
@@ -22,9 +22,9 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/resource/resource_bundle.h"
 
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index 4fcbb41..e00af5c 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -19,11 +19,11 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/country_combobox_model.h"
 #include "chrome/common/url_constants.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/phone_number_i18n.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/component_strings.h"
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.h b/chrome/browser/ui/webui/options/autofill_options_handler.h
index a9b90a8..5d58d21 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.h
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.h
@@ -9,7 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
-#include "components/autofill/browser/personal_data_manager_observer.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
 
 namespace autofill {
 class PersonalDataManager;
diff --git a/chrome/browser/webdata/autocomplete_syncable_service.cc b/chrome/browser/webdata/autocomplete_syncable_service.cc
index 2a95887..15c6931 100644
--- a/chrome/browser/webdata/autocomplete_syncable_service.cc
+++ b/chrome/browser/webdata/autocomplete_syncable_service.cc
@@ -7,8 +7,8 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/webdata/autofill_table.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/webdata/common/web_database.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/escape.h"
diff --git a/chrome/browser/webdata/autocomplete_syncable_service.h b/chrome/browser/webdata/autocomplete_syncable_service.h
index 3deb86b..fb254dc 100644
--- a/chrome/browser/webdata/autocomplete_syncable_service.h
+++ b/chrome/browser/webdata/autocomplete_syncable_service.h
@@ -15,11 +15,11 @@
 #include "base/scoped_observer.h"
 #include "base/supports_user_data.h"
 #include "base/threading/non_thread_safe.h"
-#include "components/autofill/browser/webdata/autofill_change.h"
-#include "components/autofill/browser/webdata/autofill_entry.h"
-#include "components/autofill/browser/webdata/autofill_webdata_backend.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_backend.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_data.h"
 #include "sync/api/sync_error.h"
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.cc b/chrome/browser/webdata/autofill_profile_syncable_service.cc
index 60b73b5..b5fe95a 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service.cc
+++ b/chrome/browser/webdata/autofill_profile_syncable_service.cc
@@ -8,11 +8,11 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/form_group.h"
-#include "components/autofill/browser/webdata/autofill_table.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/form_group.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/webdata/common/web_database.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/sync_error.h"
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.h b/chrome/browser/webdata/autofill_profile_syncable_service.h
index 6f0a831..e01d159 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service.h
+++ b/chrome/browser/webdata/autofill_profile_syncable_service.h
@@ -14,11 +14,11 @@
 #include "base/supports_user_data.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/webdata/autofill_change.h"
-#include "components/autofill/browser/webdata/autofill_entry.h"
-#include "components/autofill/browser/webdata/autofill_webdata_backend.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_backend.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_data.h"
 #include "sync/api/sync_error.h"
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc
index bc51614..fa55082 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc
+++ b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc
@@ -6,8 +6,8 @@
 #include "base/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/webdata/autofill_change.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
 #include "content/public/test/test_browser_thread.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/api/sync_error_factory_mock.h"
diff --git a/chrome/browser/webdata/web_data_service_factory.cc b/chrome/browser/webdata/web_data_service_factory.cc
index e63220ba..1838713 100644
--- a/chrome/browser/webdata/web_data_service_factory.cc
+++ b/chrome/browser/webdata/web_data_service_factory.cc
@@ -19,9 +19,9 @@
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_intents_table.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/webdata/autofill_table.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "components/webdata/common/webdata_constants.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ea790a3..96f8f77 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2373,7 +2373,6 @@
             'installer_util',
             'sync_file_system_proto',
             '../cc/cc.gyp:cc',
-            '../components/components.gyp:autofill_browser',
             '../components/components.gyp:autofill_content_browser',
             '../components/components.gyp:navigation_interception',
             '../net/net.gyp:net_with_v8',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index d6ee7e9..b66eb82 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -273,20 +273,20 @@
 
         # TODO(joi): Move to //components/components.gypi once
         # remaining dependencies back to //chrome are eliminated.
-        '../components/autofill/browser/android/test_auxiliary_profile_loader_android.cc',
-        '../components/autofill/browser/android/test_auxiliary_profile_loader_android.h',
-        '../components/autofill/browser/autofill_common_test.cc',
-        '../components/autofill/browser/autofill_common_test.h',
-        '../components/autofill/browser/data_driven_test.cc',
-        '../components/autofill/browser/data_driven_test.h',
-        '../components/autofill/browser/test_autofill_driver.cc',
-        '../components/autofill/browser/test_autofill_driver.h',
-        '../components/autofill/browser/test_autofill_external_delegate.cc',
-        '../components/autofill/browser/test_autofill_external_delegate.h',
-        '../components/autofill/browser/test_autofill_manager_delegate.cc',
-        '../components/autofill/browser/test_autofill_manager_delegate.h',
-        '../components/autofill/browser/test_personal_data_manager.cc',
-        '../components/autofill/browser/test_personal_data_manager.h',
+        '../components/autofill/core/browser/android/test_auxiliary_profile_loader_android.cc',
+        '../components/autofill/core/browser/android/test_auxiliary_profile_loader_android.h',
+        '../components/autofill/core/browser/autofill_common_test.cc',
+        '../components/autofill/core/browser/autofill_common_test.h',
+        '../components/autofill/core/browser/data_driven_test.cc',
+        '../components/autofill/core/browser/data_driven_test.h',
+        '../components/autofill/core/browser/test_autofill_driver.cc',
+        '../components/autofill/core/browser/test_autofill_driver.h',
+        '../components/autofill/core/browser/test_autofill_external_delegate.cc',
+        '../components/autofill/core/browser/test_autofill_external_delegate.h',
+        '../components/autofill/core/browser/test_autofill_manager_delegate.cc',
+        '../components/autofill/core/browser/test_autofill_manager_delegate.h',
+        '../components/autofill/core/browser/test_personal_data_manager.cc',
+        '../components/autofill/core/browser/test_personal_data_manager.h',
 
         '../ui/gfx/image/image_unittest_util.h',
         '../ui/gfx/image/image_unittest_util.cc',
@@ -1754,37 +1754,6 @@
 
         # TODO(joi): Move to //components/components.gypi once
         # remaining dependencies back to //chrome are eliminated.
-        '../components/autofill/browser/address_field_unittest.cc',
-        '../components/autofill/browser/address_unittest.cc',
-        '../components/autofill/browser/android/auxiliary_profile_unittest_android.cc',
-        '../components/autofill/browser/autocomplete_history_manager_unittest.cc',
-        '../components/autofill/browser/autofill_country_unittest.cc',
-        '../components/autofill/browser/autofill_data_model_unittest.cc',
-        '../components/autofill/browser/autofill_download_unittest.cc',
-        '../components/autofill/browser/autofill_download_url_unittest.cc',
-        '../components/autofill/browser/autofill_external_delegate_unittest.cc',
-        '../components/autofill/browser/autofill_field_unittest.cc',
-        '../components/autofill/browser/autofill_ie_toolbar_import_win_unittest.cc',
-        '../components/autofill/browser/autofill_manager_unittest.cc',
-        '../components/autofill/browser/autofill_merge_unittest.cc',
-        '../components/autofill/browser/autofill_metrics_unittest.cc',
-        '../components/autofill/browser/autofill_profile_unittest.cc',
-        '../components/autofill/browser/autofill_regexes_unittest.cc',
-        '../components/autofill/browser/autofill_type_unittest.cc',
-        '../components/autofill/browser/autofill_xml_parser_unittest.cc',
-        '../components/autofill/browser/contact_info_unittest.cc',
-        '../components/autofill/browser/credit_card_field_unittest.cc',
-        '../components/autofill/browser/credit_card_unittest.cc',
-        '../components/autofill/browser/form_field_unittest.cc',
-        '../components/autofill/browser/form_structure_unittest.cc',
-        '../components/autofill/browser/name_field_unittest.cc',
-        '../components/autofill/browser/password_autofill_manager_unittest.cc',
-        '../components/autofill/browser/password_generator_unittest.cc',
-        '../components/autofill/browser/personal_data_manager_unittest.cc',
-        '../components/autofill/browser/phone_field_unittest.cc',
-        '../components/autofill/browser/phone_number_unittest.cc',
-        '../components/autofill/browser/phone_number_i18n_unittest.cc',
-        '../components/autofill/browser/validation_unittest.cc',
         '../components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc',
         '../components/autofill/content/browser/autocheckout_manager_unittest.cc',
         '../components/autofill/content/browser/autocheckout_page_meta_data_unittest.cc',
@@ -1796,12 +1765,43 @@
         '../components/autofill/content/browser/wallet/wallet_items_unittest.cc',
         '../components/autofill/content/browser/wallet/wallet_service_url_unittest.cc',
         '../components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc',
+        '../components/autofill/core/browser/address_field_unittest.cc',
+        '../components/autofill/core/browser/address_unittest.cc',
+        '../components/autofill/core/browser/android/auxiliary_profile_unittest_android.cc',
+        '../components/autofill/core/browser/autocomplete_history_manager_unittest.cc',
+        '../components/autofill/core/browser/autofill_country_unittest.cc',
+        '../components/autofill/core/browser/autofill_data_model_unittest.cc',
+        '../components/autofill/core/browser/autofill_download_unittest.cc',
+        '../components/autofill/core/browser/autofill_download_url_unittest.cc',
+        '../components/autofill/core/browser/autofill_external_delegate_unittest.cc',
+        '../components/autofill/core/browser/autofill_field_unittest.cc',
+        '../components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc',
+        '../components/autofill/core/browser/autofill_manager_unittest.cc',
+        '../components/autofill/core/browser/autofill_merge_unittest.cc',
+        '../components/autofill/core/browser/autofill_metrics_unittest.cc',
+        '../components/autofill/core/browser/autofill_profile_unittest.cc',
+        '../components/autofill/core/browser/autofill_regexes_unittest.cc',
+        '../components/autofill/core/browser/autofill_type_unittest.cc',
+        '../components/autofill/core/browser/autofill_xml_parser_unittest.cc',
+        '../components/autofill/core/browser/contact_info_unittest.cc',
+        '../components/autofill/core/browser/credit_card_field_unittest.cc',
+        '../components/autofill/core/browser/credit_card_unittest.cc',
+        '../components/autofill/core/browser/form_field_unittest.cc',
+        '../components/autofill/core/browser/form_structure_unittest.cc',
+        '../components/autofill/core/browser/name_field_unittest.cc',
+        '../components/autofill/core/browser/password_autofill_manager_unittest.cc',
+        '../components/autofill/core/browser/password_generator_unittest.cc',
+        '../components/autofill/core/browser/personal_data_manager_unittest.cc',
+        '../components/autofill/core/browser/phone_field_unittest.cc',
+        '../components/autofill/core/browser/phone_number_unittest.cc',
+        '../components/autofill/core/browser/phone_number_i18n_unittest.cc',
+        '../components/autofill/core/browser/validation_unittest.cc',
 
         # TODO(caitkp): Move to //components/components.gypi once
         # remaining dependencies back to //chrome are eliminated.
-        '../components/autofill/browser/webdata/autofill_entry_unittest.cc',
-        '../components/autofill/browser/webdata/autofill_table_unittest.cc',
-        '../components/autofill/browser/webdata/web_data_service_unittest.cc',
+        '../components/autofill/core/browser/webdata/autofill_entry_unittest.cc',
+        '../components/autofill/core/browser/webdata/autofill_table_unittest.cc',
+        '../components/autofill/core/browser/webdata/web_data_service_unittest.cc',
         '../components/webdata/common/web_database_migration_unittest.cc',
         '../components/webdata/common/web_data_service_test_util.cc',
         '../components/webdata/common/web_data_service_test_util.h',
diff --git a/chrome_frame/test/delete_chrome_history_test.cc b/chrome_frame/test/delete_chrome_history_test.cc
index 302779d..32056ca 100644
--- a/chrome_frame/test/delete_chrome_history_test.cc
+++ b/chrome_frame/test/delete_chrome_history_test.cc
@@ -8,7 +8,7 @@
 #include "chrome/common/url_constants.h"
 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
 #include "chrome_frame/test/mock_ie_event_sink_test.h"
-#include "components/autofill/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/webdata/common/web_database.h"
 #include "components/webdata/common/webdata_constants.h"
 
diff --git a/components/autofill.gypi b/components/autofill.gypi
index db00537..ebd4cf0 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -12,14 +12,14 @@
         'action_name': 'autofill_regexes',
         'inputs': [
           '<(DEPTH)/build/escape_unicode.py',
-          'autofill/browser/autofill_regex_constants.cc.utf8',
+          'autofill/core/browser/autofill_regex_constants.cc.utf8',
         ],
         'outputs': [
           '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
         ],
         'action': ['python', '<(DEPTH)/build/escape_unicode.py',
                    '-o', '<(SHARED_INTERMEDIATE_DIR)',
-                   'autofill/browser/autofill_regex_constants.cc.utf8'],
+                   'autofill/core/browser/autofill_regex_constants.cc.utf8'],
       }],
     },
   ],
@@ -49,13 +49,13 @@
             '<(SHARED_INTERMEDIATE_DIR)/autofill'
           ],
           'sources': [
-            'autofill/browser/android/auxiliary_profile_loader_android.cc',
-            'autofill/browser/android/auxiliary_profile_loader_android.h',
-            'autofill/browser/android/auxiliary_profiles_android.cc',
-            'autofill/browser/android/auxiliary_profiles_android.h',
-            'autofill/browser/android/component_jni_registrar.cc',
-            'autofill/browser/android/component_jni_registrar.h',
-            'autofill/browser/android/personal_data_manager_android.cc',
+            'autofill/core/browser/android/auxiliary_profile_loader_android.cc',
+            'autofill/core/browser/android/auxiliary_profile_loader_android.h',
+            'autofill/core/browser/android/auxiliary_profiles_android.cc',
+            'autofill/core/browser/android/auxiliary_profiles_android.h',
+            'autofill/core/browser/android/component_jni_registrar.cc',
+            'autofill/core/browser/android/component_jni_registrar.h',
+            'autofill/core/browser/android/personal_data_manager_android.cc',
             'autofill/core/common/autocheckout_status.h',
             'autofill/core/common/autofill_constants.cc',
             'autofill/core/common/autofill_constants.h',
@@ -84,9 +84,7 @@
         },
 
         {
-          # TODO(blundell): Move this target to autofill_core_browser.
-          # crbug.com/247015
-          'target_name': 'autofill_browser',
+          'target_name': 'autofill_core_browser',
           'type': 'static_library',
           'include_dirs': [
             '..',
@@ -117,96 +115,96 @@
             'component_strings.gyp:component_strings',
           ],
           'sources': [
-            'autofill/browser/address.cc',
-            'autofill/browser/address.h',
-            'autofill/browser/address_field.cc',
-            'autofill/browser/address_field.h',
-            'autofill/browser/autocomplete_history_manager.cc',
-            'autofill/browser/autocomplete_history_manager.h',
-            'autofill/browser/autofill-inl.h',
-            'autofill/browser/autofill_country.cc',
-            'autofill/browser/autofill_country.h',
-            'autofill/browser/autofill_data_model.cc',
-            'autofill/browser/autofill_data_model.h',
-            'autofill/browser/autofill_download.cc',
-            'autofill/browser/autofill_download.h',
-            'autofill/browser/autofill_download_url.cc',
-            'autofill/browser/autofill_download_url.h',
-            'autofill/browser/autofill_driver.h',
-            'autofill/browser/autofill_external_delegate.cc',
-            'autofill/browser/autofill_external_delegate.h',
-            'autofill/browser/autofill_field.cc',
-            'autofill/browser/autofill_field.h',
-            'autofill/browser/autofill_ie_toolbar_import_win.cc',
-            'autofill/browser/autofill_ie_toolbar_import_win.h',
-            'autofill/browser/autofill_manager.cc',
-            'autofill/browser/autofill_manager.h',
-            'autofill/browser/autofill_manager_delegate.h',
-            'autofill/browser/autofill_manager_test_delegate.h',
-            'autofill/browser/autofill_metrics.cc',
-            'autofill/browser/autofill_metrics.h',
-            'autofill/browser/autofill_popup_delegate.h',
-            'autofill/browser/autofill_profile.cc',
-            'autofill/browser/autofill_profile.h',
-            'autofill/browser/autofill_regex_constants.cc.utf8',
-            'autofill/browser/autofill_regex_constants.h',
-            'autofill/browser/autofill_regexes.cc',
-            'autofill/browser/autofill_regexes.h',
-            'autofill/browser/autofill_scanner.cc',
-            'autofill/browser/autofill_scanner.h',
-            'autofill/browser/autofill_server_field_info.h',
-            'autofill/browser/autofill_type.cc',
-            'autofill/browser/autofill_type.h',
-            'autofill/browser/autofill_xml_parser.cc',
-            'autofill/browser/autofill_xml_parser.h',
-            'autofill/browser/contact_info.cc',
-            'autofill/browser/contact_info.h',
-            'autofill/browser/credit_card.cc',
-            'autofill/browser/credit_card.h',
-            'autofill/browser/credit_card_field.cc',
-            'autofill/browser/credit_card_field.h',
-            'autofill/browser/email_field.cc',
-            'autofill/browser/email_field.h',
-            'autofill/browser/field_types.h',
-            'autofill/browser/form_field.cc',
-            'autofill/browser/form_field.h',
-            'autofill/browser/form_group.cc',
-            'autofill/browser/form_group.h',
-            'autofill/browser/form_structure.cc',
-            'autofill/browser/form_structure.h',
-            'autofill/browser/name_field.cc',
-            'autofill/browser/name_field.h',
-            'autofill/browser/password_autofill_manager.cc',
-            'autofill/browser/password_autofill_manager.h',
-            'autofill/browser/password_generator.cc',
-            'autofill/browser/password_generator.h',
-            'autofill/browser/personal_data_manager.cc',
-            'autofill/browser/personal_data_manager.h',
-            'autofill/browser/personal_data_manager_mac.mm',
-            'autofill/browser/personal_data_manager_observer.h',
-            'autofill/browser/phone_field.cc',
-            'autofill/browser/phone_field.h',
-            'autofill/browser/phone_number.cc',
-            'autofill/browser/phone_number.h',
-            'autofill/browser/phone_number_i18n.cc',
-            'autofill/browser/phone_number_i18n.h',
-            'autofill/browser/state_names.cc',
-            'autofill/browser/state_names.h',
-            'autofill/browser/validation.cc',
-            'autofill/browser/validation.h',
-            'autofill/browser/webdata/autofill_change.cc',
-            'autofill/browser/webdata/autofill_change.h',
-            'autofill/browser/webdata/autofill_entry.cc',
-            'autofill/browser/webdata/autofill_entry.h',
-            'autofill/browser/webdata/autofill_table.cc',
-            'autofill/browser/webdata/autofill_table.h',
-            'autofill/browser/webdata/autofill_webdata.h',
-            'autofill/browser/webdata/autofill_webdata_backend.h',
-            'autofill/browser/webdata/autofill_webdata_backend_impl.cc',
-            'autofill/browser/webdata/autofill_webdata_backend_impl.h',
-            'autofill/browser/webdata/autofill_webdata_service.cc',
-            'autofill/browser/webdata/autofill_webdata_service.h',
-            'autofill/browser/webdata/autofill_webdata_service_observer.h',
+            'autofill/core/browser/address.cc',
+            'autofill/core/browser/address.h',
+            'autofill/core/browser/address_field.cc',
+            'autofill/core/browser/address_field.h',
+            'autofill/core/browser/autocomplete_history_manager.cc',
+            'autofill/core/browser/autocomplete_history_manager.h',
+            'autofill/core/browser/autofill-inl.h',
+            'autofill/core/browser/autofill_country.cc',
+            'autofill/core/browser/autofill_country.h',
+            'autofill/core/browser/autofill_data_model.cc',
+            'autofill/core/browser/autofill_data_model.h',
+            'autofill/core/browser/autofill_download.cc',
+            'autofill/core/browser/autofill_download.h',
+            'autofill/core/browser/autofill_download_url.cc',
+            'autofill/core/browser/autofill_download_url.h',
+            'autofill/core/browser/autofill_driver.h',
+            'autofill/core/browser/autofill_external_delegate.cc',
+            'autofill/core/browser/autofill_external_delegate.h',
+            'autofill/core/browser/autofill_field.cc',
+            'autofill/core/browser/autofill_field.h',
+            'autofill/core/browser/autofill_ie_toolbar_import_win.cc',
+            'autofill/core/browser/autofill_ie_toolbar_import_win.h',
+            'autofill/core/browser/autofill_manager.cc',
+            'autofill/core/browser/autofill_manager.h',
+            'autofill/core/browser/autofill_manager_delegate.h',
+            'autofill/core/browser/autofill_manager_test_delegate.h',
+            'autofill/core/browser/autofill_metrics.cc',
+            'autofill/core/browser/autofill_metrics.h',
+            'autofill/core/browser/autofill_popup_delegate.h',
+            'autofill/core/browser/autofill_profile.cc',
+            'autofill/core/browser/autofill_profile.h',
+            'autofill/core/browser/autofill_regex_constants.cc.utf8',
+            'autofill/core/browser/autofill_regex_constants.h',
+            'autofill/core/browser/autofill_regexes.cc',
+            'autofill/core/browser/autofill_regexes.h',
+            'autofill/core/browser/autofill_scanner.cc',
+            'autofill/core/browser/autofill_scanner.h',
+            'autofill/core/browser/autofill_server_field_info.h',
+            'autofill/core/browser/autofill_type.cc',
+            'autofill/core/browser/autofill_type.h',
+            'autofill/core/browser/autofill_xml_parser.cc',
+            'autofill/core/browser/autofill_xml_parser.h',
+            'autofill/core/browser/contact_info.cc',
+            'autofill/core/browser/contact_info.h',
+            'autofill/core/browser/credit_card.cc',
+            'autofill/core/browser/credit_card.h',
+            'autofill/core/browser/credit_card_field.cc',
+            'autofill/core/browser/credit_card_field.h',
+            'autofill/core/browser/email_field.cc',
+            'autofill/core/browser/email_field.h',
+            'autofill/core/browser/field_types.h',
+            'autofill/core/browser/form_field.cc',
+            'autofill/core/browser/form_field.h',
+            'autofill/core/browser/form_group.cc',
+            'autofill/core/browser/form_group.h',
+            'autofill/core/browser/form_structure.cc',
+            'autofill/core/browser/form_structure.h',
+            'autofill/core/browser/name_field.cc',
+            'autofill/core/browser/name_field.h',
+            'autofill/core/browser/password_autofill_manager.cc',
+            'autofill/core/browser/password_autofill_manager.h',
+            'autofill/core/browser/password_generator.cc',
+            'autofill/core/browser/password_generator.h',
+            'autofill/core/browser/personal_data_manager.cc',
+            'autofill/core/browser/personal_data_manager.h',
+            'autofill/core/browser/personal_data_manager_mac.mm',
+            'autofill/core/browser/personal_data_manager_observer.h',
+            'autofill/core/browser/phone_field.cc',
+            'autofill/core/browser/phone_field.h',
+            'autofill/core/browser/phone_number.cc',
+            'autofill/core/browser/phone_number.h',
+            'autofill/core/browser/phone_number_i18n.cc',
+            'autofill/core/browser/phone_number_i18n.h',
+            'autofill/core/browser/state_names.cc',
+            'autofill/core/browser/state_names.h',
+            'autofill/core/browser/validation.cc',
+            'autofill/core/browser/validation.h',
+            'autofill/core/browser/webdata/autofill_change.cc',
+            'autofill/core/browser/webdata/autofill_change.h',
+            'autofill/core/browser/webdata/autofill_entry.cc',
+            'autofill/core/browser/webdata/autofill_entry.h',
+            'autofill/core/browser/webdata/autofill_table.cc',
+            'autofill/core/browser/webdata/autofill_table.h',
+            'autofill/core/browser/webdata/autofill_webdata.h',
+            'autofill/core/browser/webdata/autofill_webdata_backend.h',
+            'autofill/core/browser/webdata/autofill_webdata_backend_impl.cc',
+            'autofill/core/browser/webdata/autofill_webdata_backend_impl.h',
+            'autofill/core/browser/webdata/autofill_webdata_service.cc',
+            'autofill/core/browser/webdata/autofill_webdata_service.h',
+            'autofill/core/browser/webdata/autofill_webdata_service_observer.h',
 
             # This file is generated by the autofill_regexes action.
             '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
@@ -245,8 +243,8 @@
             '..',
           ],
           'dependencies': [
-            'autofill_browser',
             'autofill_content_risk_proto',
+            'autofill_core_browser',
             'autofill_core_common',
             'autofill_regexes',
             'encryptor',
@@ -358,7 +356,7 @@
             '../content/content.gyp:content_java',
           ],
           'variables': {
-            'java_in_dir': 'autofill/browser/android/java',
+            'java_in_dir': 'autofill/core/browser/android/java',
           },
           'includes': [ '../build/java.gypi' ],
         },
@@ -366,7 +364,7 @@
           'target_name': 'autofill_jni_headers',
           'type': 'none',
           'sources': [
-            'autofill/browser/android/java/src/org/chromium/components/browser/autofill/PersonalAutofillPopulator.java',
+            'autofill/core/browser/android/java/src/org/chromium/components/browser/autofill/PersonalAutofillPopulator.java',
           ],
           'variables': {
             'jni_gen_package': 'autofill',
diff --git a/components/autofill/browser/android/component_jni_registrar.h b/components/autofill/browser/android/component_jni_registrar.h
deleted file mode 100644
index 1870922..0000000
--- a/components/autofill/browser/android/component_jni_registrar.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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 COMPONENT_AUTOFILL_BROWSER_ANDROID_COMPONENT_JNI_REGISTRAR_H_
-#define COMPONENT_AUTOFILL_BROWSER_ANDROID_COMPONENT_JNI_REGISTRAR_H_
-
-#include <jni.h>
-
-namespace autofill {
-
-// Register all JNI bindings necessary for the autofill
-// component.
-bool RegisterAutofillAndroidJni(JNIEnv* env);
-
-}  // namespace autofill
-
-#endif  // COMPONENT_AUTOFILL_BROWSER_ANDROID_COMPONENT_JNI_REGISTRAR_H_
diff --git a/components/autofill/browser/autofill_download_url.h b/components/autofill/browser/autofill_download_url.h
deleted file mode 100644
index ec892d5..0000000
--- a/components/autofill/browser/autofill_download_url.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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_BROWSER_AUTOFILL_DOWNLOAD_URL_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_DOWNLOAD_URL_H_
-
-class GURL;
-
-namespace autofill {
-
-GURL GetAutofillQueryUrl();
-GURL GetAutofillUploadUrl();
-
-}  // namespace autofill
-
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_DOWNLOAD_URL_H_
-
diff --git a/components/autofill/content/browser/autocheckout/whitelist_manager.h b/components/autofill/content/browser/autocheckout/whitelist_manager.h
index 1132b51..8437d91 100644
--- a/components/autofill/content/browser/autocheckout/whitelist_manager.h
+++ b/components/autofill/content/browser/autocheckout/whitelist_manager.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/timer.h"
-#include "components/autofill/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 class GURL;
diff --git a/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc b/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc
index 2ba6b1e..f4b37b2 100644
--- a/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc
+++ b/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc
@@ -6,8 +6,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autofill_metrics.h"
 #include "components/autofill/content/browser/autocheckout/whitelist_manager.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "googleurl/src/gurl.h"
diff --git a/components/autofill/content/browser/autocheckout_manager.cc b/components/autofill/content/browser/autocheckout_manager.cc
index 8f01796..0bbc895 100644
--- a/components/autofill/content/browser/autocheckout_manager.cc
+++ b/components/autofill/content/browser/autocheckout_manager.cc
@@ -7,15 +7,15 @@
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/form_structure.h"
 #include "components/autofill/content/browser/autocheckout_request_manager.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#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/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
diff --git a/components/autofill/content/browser/autocheckout_manager_unittest.cc b/components/autofill/content/browser/autocheckout_manager_unittest.cc
index 7240ad1..9c21872 100644
--- a/components/autofill/content/browser/autocheckout_manager_unittest.cc
+++ b/components/autofill/content/browser/autocheckout_manager_unittest.cc
@@ -6,13 +6,13 @@
 #include "base/tuple.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/form_structure.h"
-#include "components/autofill/browser/test_autofill_driver.h"
-#include "components/autofill/browser/test_autofill_manager_delegate.h"
 #include "components/autofill/content/browser/autocheckout_manager.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/form_structure.h"
+#include "components/autofill/core/browser/test_autofill_driver.h"
+#include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "components/autofill/core/common/form_data.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/components/autofill/content/browser/autocheckout_request_manager.cc b/components/autofill/content/browser/autocheckout_request_manager.cc
index 103ad43..22c9f5d 100644
--- a/components/autofill/content/browser/autocheckout_request_manager.cc
+++ b/components/autofill/content/browser/autocheckout_request_manager.cc
@@ -4,7 +4,7 @@
 
 #include "components/autofill/content/browser/autocheckout_request_manager.h"
 
-#include "components/autofill/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
 #include "content/public/browser/browser_context.h"
 
 namespace {
diff --git a/components/autofill/content/browser/autocheckout_request_manager.h b/components/autofill/content/browser/autocheckout_request_manager.h
index 6347dd2..a186653 100644
--- a/components/autofill/content/browser/autocheckout_request_manager.h
+++ b/components/autofill/content/browser/autocheckout_request_manager.h
@@ -6,9 +6,9 @@
 #define COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_REQUEST_MANAGER_H_
 
 #include "base/supports_user_data.h"
-#include "components/autofill/browser/autofill_metrics.h"
 #include "components/autofill/content/browser/wallet/wallet_client.h"
 #include "components/autofill/content/browser/wallet/wallet_client_delegate.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/common/autocheckout_status.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/components/autofill/content/browser/autofill_driver_impl.cc b/components/autofill/content/browser/autofill_driver_impl.cc
index 4b76fb5..9df913f 100644
--- a/components/autofill/content/browser/autofill_driver_impl.cc
+++ b/components/autofill/content/browser/autofill_driver_impl.cc
@@ -4,9 +4,9 @@
 
 #include "components/autofill/content/browser/autofill_driver_impl.h"
 
-#include "components/autofill/browser/autofill_external_delegate.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_external_delegate.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
 #include "content/public/browser/web_contents.h"
 
 namespace autofill {
diff --git a/components/autofill/content/browser/autofill_driver_impl.h b/components/autofill/content/browser/autofill_driver_impl.h
index ffce5ef..b577293 100644
--- a/components/autofill/content/browser/autofill_driver_impl.h
+++ b/components/autofill/content/browser/autofill_driver_impl.h
@@ -9,9 +9,9 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/supports_user_data.h"
-#include "components/autofill/browser/autofill_driver.h"
-#include "components/autofill/browser/autofill_external_delegate.h"
-#include "components/autofill/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autofill_driver.h"
+#include "components/autofill/core/browser/autofill_external_delegate.h"
+#include "components/autofill/core/browser/autofill_manager.h"
 #include "content/public/browser/web_contents_observer.h"
 
 namespace content {
diff --git a/components/autofill/content/browser/risk/fingerprint.h b/components/autofill/content/browser/risk/fingerprint.h
index 7aa83b1..d66bde4 100644
--- a/components/autofill/content/browser/risk/fingerprint.h
+++ b/components/autofill/content/browser/risk/fingerprint.h
@@ -17,7 +17,7 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
 
 class PrefService;
 
diff --git a/components/autofill/content/browser/wallet/form_field_error.h b/components/autofill/content/browser/wallet/form_field_error.h
index 3456cc4..91a67b4 100644
--- a/components/autofill/content/browser/wallet/form_field_error.h
+++ b/components/autofill/content/browser/wallet/form_field_error.h
@@ -6,7 +6,7 @@
 #define COMPONENTS_AUTOFILL_BROWSER_WALLET_FORM_FIELD_ERROR_H_
 
 #include "base/strings/string16.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/components/autofill/content/browser/wallet/full_wallet.cc b/components/autofill/content/browser/wallet/full_wallet.cc
index 1605f22..4a3361e 100644
--- a/components/autofill/content/browser/wallet/full_wallet.cc
+++ b/components/autofill/content/browser/wallet/full_wallet.cc
@@ -8,7 +8,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/autofill/browser/credit_card.h"
+#include "components/autofill/core/browser/credit_card.h"
 
 namespace {
 
diff --git a/components/autofill/content/browser/wallet/instrument.cc b/components/autofill/content/browser/wallet/instrument.cc
index b9006b6..5e1c8c7 100644
--- a/components/autofill/content/browser/wallet/instrument.cc
+++ b/components/autofill/content/browser/wallet/instrument.cc
@@ -9,11 +9,11 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/validation.h"
 #include "components/autofill/content/browser/wallet/wallet_address.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/validation.h"
 
 namespace autofill {
 namespace wallet {
diff --git a/components/autofill/content/browser/wallet/wallet_address.cc b/components/autofill/content/browser/wallet/wallet_address.cc
index f4dec60..8c9d084 100644
--- a/components/autofill/content/browser/wallet/wallet_address.cc
+++ b/components/autofill/content/browser/wallet/wallet_address.cc
@@ -8,9 +8,9 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/state_names.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/state_names.h"
 
 namespace autofill {
 namespace wallet {
diff --git a/components/autofill/content/browser/wallet/wallet_address.h b/components/autofill/content/browser/wallet/wallet_address.h
index 8e9d709e..fe9ef9a 100644
--- a/components/autofill/content/browser/wallet/wallet_address.h
+++ b/components/autofill/content/browser/wallet/wallet_address.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace base {
 class DictionaryValue;
@@ -23,7 +23,7 @@ class AutofillProfile;
 namespace wallet {
 
 // TODO(ahutter): This address is a lot like
-// components/autofill/browser/address.h.  There should be a super
+// components/autofill/core/browser/address.h.  There should be a super
 // class that both extend from to clean up duplicated code. See
 // http://crbug.com/164463.
 
diff --git a/components/autofill/content/browser/wallet/wallet_address_unittest.cc b/components/autofill/content/browser/wallet/wallet_address_unittest.cc
index 24a43b4..6a09fa9 100644
--- a/components/autofill/content/browser/wallet/wallet_address_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_address_unittest.cc
@@ -7,9 +7,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/content/browser/wallet/wallet_address.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/components/autofill/content/browser/wallet/wallet_client.cc b/components/autofill/content/browser/wallet/wallet_client.cc
index 85cfa4c..e129d1f 100644
--- a/components/autofill/content/browser/wallet/wallet_client.cc
+++ b/components/autofill/content/browser/wallet/wallet_client.cc
@@ -10,13 +10,13 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
-#include "components/autofill/browser/autofill_metrics.h"
 #include "components/autofill/content/browser/wallet/form_field_error.h"
 #include "components/autofill/content/browser/wallet/instrument.h"
 #include "components/autofill/content/browser/wallet/wallet_address.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_service_url.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "crypto/random.h"
 #include "google_apis/google_api_keys.h"
 #include "net/http/http_status_code.h"
diff --git a/components/autofill/content/browser/wallet/wallet_client.h b/components/autofill/content/browser/wallet/wallet_client.h
index cd06a03..54b555c 100644
--- a/components/autofill/content/browser/wallet/wallet_client.h
+++ b/components/autofill/content/browser/wallet/wallet_client.h
@@ -13,12 +13,12 @@
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "base/values.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
-#include "components/autofill/browser/autofill_metrics.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/core/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/common/autocheckout_status.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher_delegate.h"
diff --git a/components/autofill/content/browser/wallet/wallet_client_delegate.h b/components/autofill/content/browser/wallet/wallet_client_delegate.h
index fd04293..e21ff1d 100644
--- a/components/autofill/content/browser/wallet/wallet_client_delegate.h
+++ b/components/autofill/content/browser/wallet/wallet_client_delegate.h
@@ -8,9 +8,9 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
 #include "components/autofill/content/browser/wallet/form_field_error.h"
 #include "components/autofill/content/browser/wallet/wallet_client.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
 
 class AutofillMetrics;
 
diff --git a/components/autofill/content/browser/wallet/wallet_client_unittest.cc b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
index 18aa06d..674b5b9 100644
--- a/components/autofill/content/browser/wallet/wallet_client_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
@@ -10,13 +10,13 @@
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autofill_metrics.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/core/browser/autofill_metrics.h"
 #include "components/autofill/core/common/autocheckout_status.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
diff --git a/components/autofill/content/browser/wallet/wallet_items.cc b/components/autofill/content/browser/wallet/wallet_items.cc
index 4e55744..de64dae 100644
--- a/components/autofill/content/browser/wallet/wallet_items.cc
+++ b/components/autofill/content/browser/wallet/wallet_items.cc
@@ -8,8 +8,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/credit_card.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/credit_card.h"
 #include "googleurl/src/gurl.h"
 #include "grit/component_strings.h"
 #include "grit/webkit_resources.h"
diff --git a/components/autofill/browser/DEPS b/components/autofill/core/browser/DEPS
index 57393b3..4004d48 100644
--- a/components/autofill/browser/DEPS
+++ b/components/autofill/core/browser/DEPS
@@ -1,19 +1,36 @@
 include_rules = [
   "+components/webdata/common",
-  "+content/public/browser",
-  "+content/public/common",
   "+crypto/random.h",
   "+google_apis/gaia",
   "+google_apis/google_api_keys.h",
-  "+gpu/config/gpu_info.h",
   "+net",
   "+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(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/browser/android/content_view_core.h",
+  "!content/public/browser/browser_context.h",
+  "!content/public/browser/browser_thread.h",
+  "!content/public/browser/navigation_controller.h",
+  "!content/public/browser/navigation_details.h",
+  "!content/public/browser/notification_details.h",
+  "!content/public/browser/notification_observer.h",
+  "!content/public/browser/notification_registrar.h",
+  "!content/public/browser/notification_service.h",
+  "!content/public/browser/notification_source.h",
+  "!content/public/browser/notification_types.h",
+  "!content/public/browser/render_view_host.h",
+  "!content/public/browser/web_contents.h",
+  "!content/public/browser/web_contents_observer.h",
+  "!content/public/browser/web_contents_view.h",
+  "!content/public/common/frame_navigate_params.h",
+  "!content/public/common/url_constants.h",
+  "!third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h",
+  "!third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h",
 
   # TODO(akalin): Remove this dependency.
   "!sync/util/data_encryption_win.h",
@@ -23,7 +40,7 @@ specific_include_rules = {
   '.*_[a-z]*test\.cc': [
     "+content/public/test",
 
-    # TODO(joi, kaiwang): Bring this list to zero.
+    # TODO(joi): 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.
diff --git a/components/autofill/browser/address.cc b/components/autofill/core/browser/address.cc
index 0730be8..2f1694e 100644
--- a/components/autofill/browser/address.cc
+++ b/components/autofill/core/browser/address.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/address.h"
+#include "components/autofill/core/browser/address.h"
 
 #include <stddef.h>
 
@@ -10,10 +10,10 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace {
 
diff --git a/components/autofill/browser/address.h b/components/autofill/core/browser/address.h
index d4d0386..e55dc85 100644
--- a/components/autofill/browser/address.h
+++ b/components/autofill/core/browser/address.h
@@ -1,18 +1,18 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_ADDRESS_H_
-#define COMPONENTS_AUTOFILL_BROWSER_ADDRESS_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/form_group.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/form_group.h"
 
 namespace autofill {
 
@@ -53,4 +53,4 @@ class Address : public FormGroup {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_ADDRESS_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_H_
diff --git a/components/autofill/browser/address_field.cc b/components/autofill/core/browser/address_field.cc
index 408a4db..c219465 100644
--- a/components/autofill/browser/address_field.cc
+++ b/components/autofill/core/browser/address_field.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/address_field.h"
+#include "components/autofill/core/browser/address_field.h"
 
 #include <stddef.h>
 
@@ -11,10 +11,10 @@
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_regex_constants.h"
-#include "components/autofill/browser/autofill_scanner.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_regex_constants.h"
+#include "components/autofill/core/browser/autofill_scanner.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/address_field.h b/components/autofill/core/browser/address_field.h
index 4e36858..ba90bb4 100644
--- a/components/autofill/browser/address_field.h
+++ b/components/autofill/core/browser/address_field.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_ADDRESS_FIELD_H_
-#define COMPONENTS_AUTOFILL_BROWSER_ADDRESS_FIELD_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_FIELD_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_FIELD_H_
 
 #include <vector>
 
@@ -11,8 +11,8 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/form_field.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/form_field.h"
 
 namespace autofill {
 
@@ -85,4 +85,4 @@ class AddressField : public FormField {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_ADDRESS_FIELD_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_FIELD_H_
diff --git a/components/autofill/browser/address_field_unittest.cc b/components/autofill/core/browser/address_field_unittest.cc
index cd7cc9d..d92ee25 100644
--- a/components/autofill/browser/address_field_unittest.cc
+++ b/components/autofill/core/browser/address_field_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,9 +6,9 @@
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/address_field.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_scanner.h"
+#include "components/autofill/core/browser/address_field.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/autofill/browser/address_unittest.cc b/components/autofill/core/browser/address_unittest.cc
index 81830f8..3b175ba 100644
--- a/components/autofill/browser/address_unittest.cc
+++ b/components/autofill/core/browser/address_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,8 +7,8 @@
 #include "base/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/address.h"
-#include "components/autofill/browser/autofill_type.h"
+#include "components/autofill/core/browser/address.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/autofill/browser/android/auxiliary_profile_loader_android.cc b/components/autofill/core/browser/android/auxiliary_profile_loader_android.cc
index 5d8ff09..4361791 100644
--- a/components/autofill/browser/android/auxiliary_profile_loader_android.cc
+++ b/components/autofill/core/browser/android/auxiliary_profile_loader_android.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/browser/android/auxiliary_profile_loader_android.h"
+#include "components/autofill/core/browser/android/auxiliary_profile_loader_android.h"
 
 #include <vector>
 
diff --git a/components/autofill/browser/android/auxiliary_profile_loader_android.h b/components/autofill/core/browser/android/auxiliary_profile_loader_android.h
index 787fd25..2185e83 100644
--- a/components/autofill/browser/android/auxiliary_profile_loader_android.h
+++ b/components/autofill/core/browser/android/auxiliary_profile_loader_android.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_BROWSER_ANDROID_AUXILIARY_PROFILE_LOADER_ANDROID_H_
-#define COMPONENTS_AUTOFILL_BROWSER_ANDROID_AUXILIARY_PROFILE_LOADER_ANDROID_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_AUXILIARY_PROFILE_LOADER_ANDROID_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_AUXILIARY_PROFILE_LOADER_ANDROID_H_
 
 #include <vector>
 
@@ -72,4 +72,4 @@ class AuxiliaryProfileLoaderAndroid {
 
 } // namespace
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_ANDROID_AUXILIARY_PROFILE_LOADER_ANDROID_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_AUXILIARY_PROFILE_LOADER_ANDROID_H_
diff --git a/components/autofill/browser/android/auxiliary_profile_unittest_android.cc b/components/autofill/core/browser/android/auxiliary_profile_unittest_android.cc
index 35daf66..b8f8dce 100644
--- a/components/autofill/browser/android/auxiliary_profile_unittest_android.cc
+++ b/components/autofill/core/browser/android/auxiliary_profile_unittest_android.cc
@@ -5,10 +5,10 @@
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/android/auxiliary_profile_loader_android.h"
-#include "components/autofill/browser/android/auxiliary_profiles_android.h"
-#include "components/autofill/browser/android/test_auxiliary_profile_loader_android.h"
-#include "components/autofill/browser/autofill_profile.h"
+#include "components/autofill/core/browser/android/auxiliary_profile_loader_android.h"
+#include "components/autofill/core/browser/android/auxiliary_profiles_android.h"
+#include "components/autofill/core/browser/android/test_auxiliary_profile_loader_android.h"
+#include "components/autofill/core/browser/autofill_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/android/auxiliary_profiles_android.cc b/components/autofill/core/browser/android/auxiliary_profiles_android.cc
index 2c141f7..7556521 100644
--- a/components/autofill/browser/android/auxiliary_profiles_android.cc
+++ b/components/autofill/core/browser/android/auxiliary_profiles_android.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // Populates default autofill profile from user's own Android contact.
-#include "components/autofill/browser/android/auxiliary_profiles_android.h"
+#include "components/autofill/core/browser/android/auxiliary_profiles_android.h"
 
 #include <vector>
 
@@ -14,9 +14,9 @@
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/android/auxiliary_profile_loader_android.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/phone_number.h"
+#include "components/autofill/core/browser/android/auxiliary_profile_loader_android.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/phone_number.h"
 
 // Generates the autofill profile by accessing the Android
 // ContactsContract.Profile API through PersonalAutofillPopulator via JNI.
diff --git a/components/autofill/browser/android/auxiliary_profiles_android.h b/components/autofill/core/browser/android/auxiliary_profiles_android.h
index 559b428..5f81fd1 100644
--- a/components/autofill/browser/android/auxiliary_profiles_android.h
+++ b/components/autofill/core/browser/android/auxiliary_profiles_android.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_ANDROID_AUXILIARY_PROFILES_ANDROID_H_
-#define COMPONENTS_AUTOFILL_BROWSER_ANDROID_AUXILIARY_PROFILES_ANDROID_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_AUXILIARY_PROFILES_ANDROID_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_AUXILIARY_PROFILES_ANDROID_H_
 
 #include <jni.h>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/android/auxiliary_profile_loader_android.h"
+#include "components/autofill/core/browser/android/auxiliary_profile_loader_android.h"
 
 namespace autofill {
 
@@ -51,4 +51,4 @@ class AuxiliaryProfilesAndroid {
 
 } // namespace
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_ANDROID_AUXILIARY_PROFILES_ANDROID_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_AUXILIARY_PROFILES_ANDROID_H_
diff --git a/components/autofill/browser/android/component_jni_registrar.cc b/components/autofill/core/browser/android/component_jni_registrar.cc
index 3f9cc54..f3aac1f 100644
--- a/components/autofill/browser/android/component_jni_registrar.cc
+++ b/components/autofill/core/browser/android/component_jni_registrar.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/android/component_jni_registrar.h"
+#include "components/autofill/core/browser/android/component_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
-#include "components/autofill/browser/android/auxiliary_profile_loader_android.h"
+#include "components/autofill/core/browser/android/auxiliary_profile_loader_android.h"
 
 namespace autofill {
 
diff --git a/components/autofill/core/browser/android/component_jni_registrar.h b/components/autofill/core/browser/android/component_jni_registrar.h
new file mode 100644
index 0000000..6cc0900
--- /dev/null
+++ b/components/autofill/core/browser/android/component_jni_registrar.h
@@ -0,0 +1,18 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_COMPONENT_JNI_REGISTRAR_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_COMPONENT_JNI_REGISTRAR_H_
+
+#include <jni.h>
+
+namespace autofill {
+
+// Register all JNI bindings necessary for the autofill
+// component.
+bool RegisterAutofillAndroidJni(JNIEnv* env);
+
+}  // namespace autofill
+
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_COMPONENT_JNI_REGISTRAR_H_
diff --git a/components/autofill/browser/android/java/src/org/chromium/components/browser/autofill/PersonalAutofillPopulator.java b/components/autofill/core/browser/android/java/src/org/chromium/components/browser/autofill/PersonalAutofillPopulator.java
index b00ed61..b00ed61 100644
--- a/components/autofill/browser/android/java/src/org/chromium/components/browser/autofill/PersonalAutofillPopulator.java
+++ b/components/autofill/core/browser/android/java/src/org/chromium/components/browser/autofill/PersonalAutofillPopulator.java
diff --git a/components/autofill/browser/android/personal_data_manager_android.cc b/components/autofill/core/browser/android/personal_data_manager_android.cc
index 3655314..9a6e1c6 100644
--- a/components/autofill/browser/android/personal_data_manager_android.cc
+++ b/components/autofill/core/browser/android/personal_data_manager_android.cc
@@ -4,9 +4,9 @@
 
 // Populates default autofill profile from user's own Android contact.
 
-#include "components/autofill/browser/android/auxiliary_profile_loader_android.h"
-#include "components/autofill/browser/android/auxiliary_profiles_android.h"
-#include "components/autofill/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/android/auxiliary_profile_loader_android.h"
+#include "components/autofill/core/browser/android/auxiliary_profiles_android.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/android/test_auxiliary_profile_loader_android.cc b/components/autofill/core/browser/android/test_auxiliary_profile_loader_android.cc
index 8e9b67a..ced72c8 100644
--- a/components/autofill/browser/android/test_auxiliary_profile_loader_android.cc
+++ b/components/autofill/core/browser/android/test_auxiliary_profile_loader_android.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/browser/android/test_auxiliary_profile_loader_android.h"
+#include "components/autofill/core/browser/android/test_auxiliary_profile_loader_android.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/android/test_auxiliary_profile_loader_android.h b/components/autofill/core/browser/android/test_auxiliary_profile_loader_android.h
index f9e40b1..34d424c 100644
--- a/components/autofill/browser/android/test_auxiliary_profile_loader_android.h
+++ b/components/autofill/core/browser/android/test_auxiliary_profile_loader_android.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_ANDROID_TEST_AUXILIARY_PROFILE_LOADER_ANDROID_H_
-#define COMPONENTS_AUTOFILL_BROWSER_ANDROID_TEST_AUXILIARY_PROFILE_LOADER_ANDROID_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_TEST_AUXILIARY_PROFILE_LOADER_ANDROID_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_TEST_AUXILIARY_PROFILE_LOADER_ANDROID_H_
 
 #include "base/compiler_specific.h"
-#include "components/autofill/browser/android/auxiliary_profile_loader_android.h"
+#include "components/autofill/core/browser/android/auxiliary_profile_loader_android.h"
 
 namespace autofill {
 
@@ -71,4 +71,4 @@ class TestAuxiliaryProfileLoader
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_ANDROID_TEST_AUXILIARY_PROFILE_LOADER_ANDROID_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_ANDROID_TEST_AUXILIARY_PROFILE_LOADER_ANDROID_H_
diff --git a/components/autofill/browser/autocomplete_history_manager.cc b/components/autofill/core/browser/autocomplete_history_manager.cc
index efe5296..8f5df63 100644
--- a/components/autofill/browser/autocomplete_history_manager.cc
+++ b/components/autofill/core/browser/autocomplete_history_manager.cc
@@ -1,17 +1,17 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autocomplete_history_manager.h"
+#include "components/autofill/core/browser/autocomplete_history_manager.h"
 
 #include <vector>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_driver.h"
-#include "components/autofill/browser/autofill_external_delegate.h"
-#include "components/autofill/browser/validation.h"
+#include "components/autofill/core/browser/autofill_driver.h"
+#include "components/autofill/core/browser/autofill_external_delegate.h"
+#include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_data.h"
diff --git a/components/autofill/browser/autocomplete_history_manager.h b/components/autofill/core/browser/autocomplete_history_manager.h
index bec877a..84f31b8 100644
--- a/components/autofill/browser/autocomplete_history_manager.h
+++ b/components/autofill/core/browser/autocomplete_history_manager.h
@@ -1,15 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/prefs/pref_member.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/webdata/common/web_data_service_consumer.h"
 
 namespace content {
@@ -97,4 +97,4 @@ class AutocompleteHistoryManager : public WebDataServiceConsumer {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_
diff --git a/components/autofill/browser/autocomplete_history_manager_unittest.cc b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
index 562b73f..2ccab1d 100644
--- a/components/autofill/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -14,12 +14,12 @@
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
-#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/browser/test_autofill_driver.h"
-#include "components/autofill/browser/test_autofill_manager_delegate.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/autocomplete_history_manager.h"
+#include "components/autofill/core/browser/autofill_external_delegate.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/test_autofill_driver.h"
+#include "components/autofill/core/browser/test_autofill_manager_delegate.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/webdata/common/web_data_service_test_util.h"
 #include "content/public/test/test_browser_thread.h"
diff --git a/components/autofill/browser/autofill-inl.h b/components/autofill/core/browser/autofill-inl.h
index 0103c7c..33e6a88 100644
--- a/components/autofill/browser/autofill-inl.h
+++ b/components/autofill/core/browser/autofill-inl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_INL_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_INL_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_INL_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_INL_H_
 
 namespace autofill {
 
@@ -36,4 +36,4 @@ bool FindByContents(const C& container, const T& form_group) {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_INL_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_INL_H_
diff --git a/components/autofill/browser/autofill_common_test.cc b/components/autofill/core/browser/autofill_common_test.cc
index cd33530..948f4ab 100644
--- a/components/autofill/browser/autofill_common_test.cc
+++ b/components/autofill/core/browser/autofill_common_test.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
 
 #include "base/guid.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/user_prefs/user_prefs.h"
diff --git a/components/autofill/browser/autofill_common_test.h b/components/autofill/core/browser/autofill_common_test.h
index fa0fa70..c922a53 100644
--- a/components/autofill/browser/autofill_common_test.h
+++ b/components/autofill/core/browser/autofill_common_test.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_COMMON_TEST_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_COMMON_TEST_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_COMMON_TEST_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_COMMON_TEST_H_
 
 class Profile;
 
@@ -73,4 +73,4 @@ void DisableSystemServices(Profile* profile);
 }  // namespace test
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_COMMON_TEST_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_COMMON_TEST_H_
diff --git a/components/autofill/browser/autofill_country.cc b/components/autofill/core/browser/autofill_country.cc
index ad080bc..1bbe554 100644
--- a/components/autofill/browser/autofill_country.cc
+++ b/components/autofill/core/browser/autofill_country.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_country.h"
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/components/autofill/browser/autofill_country.h b/components/autofill/core/browser/autofill_country.h
index 3fa8415..17bb74c 100644
--- a/components/autofill/browser/autofill_country.h
+++ b/components/autofill/core/browser/autofill_country.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_COUNTRY_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_COUNTRY_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_COUNTRY_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_COUNTRY_H_
 
 #include <string>
 #include <vector>
@@ -107,4 +107,4 @@ class AutofillCountry {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_COUNTRY_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_COUNTRY_H_
diff --git a/components/autofill/browser/autofill_country_unittest.cc b/components/autofill/core/browser/autofill_country_unittest.cc
index e2f154c..dc43a52 100644
--- a/components/autofill/browser/autofill_country_unittest.cc
+++ b/components/autofill/core/browser/autofill_country_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,7 +6,7 @@
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_country.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/autofill_data_model.cc b/components/autofill/core/browser/autofill_data_model.cc
index de2910c..5ea548a 100644
--- a/components/autofill/browser/autofill_data_model.cc
+++ b/components/autofill/core/browser/autofill_data_model.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_data_model.h"
+#include "components/autofill/core/browser/autofill_data_model.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/state_names.h"
-#include "components/autofill/browser/validation.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/state_names.h"
+#include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "googleurl/src/gurl.h"
 #include "grit/component_strings.h"
diff --git a/components/autofill/browser/autofill_data_model.h b/components/autofill/core/browser/autofill_data_model.h
index b060d3a..24739da 100644
--- a/components/autofill/browser/autofill_data_model.h
+++ b/components/autofill/core/browser/autofill_data_model.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_BROWSER_AUTOFILL_DATA_MODEL_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_DATA_MODEL_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DATA_MODEL_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DATA_MODEL_H_
 
 #include <string>
 
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/form_group.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/form_group.h"
 
 namespace autofill {
 
@@ -67,4 +67,4 @@ class AutofillDataModel : public FormGroup {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_DATA_MODEL_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DATA_MODEL_H_
diff --git a/components/autofill/browser/autofill_data_model_unittest.cc b/components/autofill/core/browser/autofill_data_model_unittest.cc
index bcd8ae1..05adaf9 100644
--- a/components/autofill/browser/autofill_data_model_unittest.cc
+++ b/components/autofill/core/browser/autofill_data_model_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_data_model.h"
+#include "components/autofill/core/browser/autofill_data_model.h"
 
 #include "base/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/autofill_download.cc b/components/autofill/core/browser/autofill_download.cc
index b3a318ab..a613315 100644
--- a/components/autofill/browser/autofill_download.cc
+++ b/components/autofill/core/browser/autofill_download.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_download.h"
+#include "components/autofill/core/browser/autofill_download.h"
 
 #include <algorithm>
 #include <ostream>
@@ -13,10 +13,10 @@
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
-#include "components/autofill/browser/autofill_download_url.h"
-#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/core/browser/autofill_download_url.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_xml_parser.h"
+#include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/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/autofill_download.h b/components/autofill/core/browser/autofill_download.h
index 940fb17..09cc1cf 100644
--- a/components/autofill/browser/autofill_download.h
+++ b/components/autofill/core/browser/autofill_download.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_DOWNLOAD_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_DOWNLOAD_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DOWNLOAD_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DOWNLOAD_H_
 
 #include <stddef.h>
 #include <list>
@@ -15,7 +15,7 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/time.h"
-#include "components/autofill/browser/autofill_type.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace content {
@@ -167,4 +167,4 @@ class AutofillDownloadManager : public net::URLFetcherDelegate {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_DOWNLOAD_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DOWNLOAD_H_
diff --git a/components/autofill/browser/autofill_download_unittest.cc b/components/autofill/core/browser/autofill_download_unittest.cc
index 7b3798c..a9838d9 100644
--- a/components/autofill/browser/autofill_download_unittest.cc
+++ b/components/autofill/core/browser/autofill_download_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -10,11 +10,11 @@
 #include "base/test/test_timeouts.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autofill_download.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/form_structure.h"
+#include "components/autofill/core/browser/autofill_download.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/common/form_data.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/url_request/test_url_fetcher_factory.h"
diff --git a/components/autofill/browser/autofill_download_url.cc b/components/autofill/core/browser/autofill_download_url.cc
index 2710c79..89984c2 100644
--- a/components/autofill/browser/autofill_download_url.cc
+++ b/components/autofill/core/browser/autofill_download_url.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_download_url.h"
+#include "components/autofill/core/browser/autofill_download_url.h"
 
 #include <string>
 
diff --git a/components/autofill/core/browser/autofill_download_url.h b/components/autofill/core/browser/autofill_download_url.h
new file mode 100644
index 0000000..894a060
--- /dev/null
+++ b/components/autofill/core/browser/autofill_download_url.h
@@ -0,0 +1,18 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DOWNLOAD_URL_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DOWNLOAD_URL_H_
+
+class GURL;
+
+namespace autofill {
+
+GURL GetAutofillQueryUrl();
+GURL GetAutofillUploadUrl();
+
+}  // namespace autofill
+
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DOWNLOAD_URL_H_
+
diff --git a/components/autofill/browser/autofill_download_url_unittest.cc b/components/autofill/core/browser/autofill_download_url_unittest.cc
index f201c00..d48c1f6 100644
--- a/components/autofill/browser/autofill_download_url_unittest.cc
+++ b/components/autofill/core/browser/autofill_download_url_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_download_url.h"
+#include "components/autofill/core/browser/autofill_download_url.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/autofill_driver.h b/components/autofill/core/browser/autofill_driver.h
index 15a6fa5..178e31b 100644
--- a/components/autofill/browser/autofill_driver.h
+++ b/components/autofill/core/browser/autofill_driver.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_BROWSER_AUTOFILL_DRIVER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_DRIVER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DRIVER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DRIVER_H_
 
 namespace content {
 class WebContents;
@@ -24,4 +24,4 @@ class AutofillDriver {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_DRIVER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DRIVER_H_
diff --git a/components/autofill/browser/autofill_external_delegate.cc b/components/autofill/core/browser/autofill_external_delegate.cc
index 94e2d29..0163ca1 100644
--- a/components/autofill/browser/autofill_external_delegate.cc
+++ b/components/autofill/core/browser/autofill_external_delegate.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_external_delegate.h"
+#include "components/autofill/core/browser/autofill_external_delegate.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autocomplete_history_manager.h"
-#include "components/autofill/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autocomplete_history_manager.h"
+#include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
diff --git a/components/autofill/browser/autofill_external_delegate.h b/components/autofill/core/browser/autofill_external_delegate.h
index dac7dbe..9daa9be 100644
--- a/components/autofill/browser/autofill_external_delegate.h
+++ b/components/autofill/core/browser/autofill_external_delegate.h
@@ -1,17 +1,17 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/autofill_popup_delegate.h"
-#include "components/autofill/browser/password_autofill_manager.h"
+#include "components/autofill/core/browser/autofill_popup_delegate.h"
+#include "components/autofill/core/browser/password_autofill_manager.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
@@ -190,4 +190,4 @@ class AutofillExternalDelegate
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
diff --git a/components/autofill/browser/autofill_external_delegate_unittest.cc b/components/autofill/core/browser/autofill_external_delegate_unittest.cc
index 96ae2b9..7967701 100644
--- a/components/autofill/browser/autofill_external_delegate_unittest.cc
+++ b/components/autofill/core/browser/autofill_external_delegate_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,10 +9,10 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/test_autofill_driver.h"
-#include "components/autofill/browser/test_autofill_external_delegate.h"
-#include "components/autofill/browser/test_autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/test_autofill_driver.h"
+#include "components/autofill/core/browser/test_autofill_external_delegate.h"
+#include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
diff --git a/components/autofill/browser/autofill_field.cc b/components/autofill/core/browser/autofill_field.cc
index 3adf024b..9e72054 100644
--- a/components/autofill/browser/autofill_field.cc
+++ b/components/autofill/core/browser/autofill_field.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_field.h"
 
 #include "base/logging.h"
 #include "base/sha1.h"
diff --git a/components/autofill/browser/autofill_field.h b/components/autofill/core/browser/autofill_field.h
index d66146a..e4e8217 100644
--- a/components/autofill/browser/autofill_field.h
+++ b/components/autofill/core/browser/autofill_field.h
@@ -1,15 +1,15 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_FIELD_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_FIELD_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_FIELD_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_FIELD_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/common/form_field_data.h"
 
 namespace autofill {
@@ -89,4 +89,4 @@ class AutofillField : public FormFieldData {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_FIELD_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_FIELD_H_
diff --git a/components/autofill/browser/autofill_field_unittest.cc b/components/autofill/core/browser/autofill_field_unittest.cc
index 2072d23..53de47b 100644
--- a/components/autofill/browser/autofill_field_unittest.cc
+++ b/components/autofill/core/browser/autofill_field_unittest.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/autofill_ie_toolbar_import_win.cc b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
index 0020eb3..d34e362 100644
--- a/components/autofill/browser/autofill_ie_toolbar_import_win.cc
+++ b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_ie_toolbar_import_win.h"
+#include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h"
 
 #include <stddef.h>
 #include <map>
@@ -14,16 +14,16 @@
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/win/registry.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/crypto/rc4_decryptor.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/form_group.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/personal_data_manager_observer.h"
-#include "components/autofill/browser/phone_number.h"
-#include "components/autofill/browser/phone_number_i18n.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/crypto/rc4_decryptor.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/form_group.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#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 "sync/util/data_encryption_win.h"
 
 using base::win::RegKey;
diff --git a/components/autofill/browser/autofill_ie_toolbar_import_win.h b/components/autofill/core/browser/autofill_ie_toolbar_import_win.h
index 3c2579c..830aac2 100644
--- a/components/autofill/browser/autofill_ie_toolbar_import_win.h
+++ b/components/autofill/core/browser/autofill_ie_toolbar_import_win.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_IE_TOOLBAR_IMPORT_WIN_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_IE_TOOLBAR_IMPORT_WIN_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_IE_TOOLBAR_IMPORT_WIN_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_IE_TOOLBAR_IMPORT_WIN_H_
 
 namespace autofill {
 
@@ -21,4 +21,4 @@ bool ImportAutofillDataWin(PersonalDataManager* pdm);
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_IE_TOOLBAR_IMPORT_WIN_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_IE_TOOLBAR_IMPORT_WIN_H_
diff --git a/components/autofill/browser/autofill_ie_toolbar_import_win_unittest.cc b/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc
index a4e1dc9..13e1b03 100644
--- a/components/autofill/browser/autofill_ie_toolbar_import_win_unittest.cc
+++ b/components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_ie_toolbar_import_win.h"
+#include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "base/win/registry.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/field_types.h"
+#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 "sync/util/data_encryption_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
index ea6864d..6532b7a 100644
--- a/components/autofill/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autofill_manager.h"
 
 #include <stddef.h>
 
@@ -20,23 +20,23 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "components/autofill/browser/autocomplete_history_manager.h"
-#include "components/autofill/browser/autofill_data_model.h"
-#include "components/autofill/browser/autofill_driver.h"
-#include "components/autofill/browser/autofill_external_delegate.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
-#include "components/autofill/browser/autofill_manager_test_delegate.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/form_structure.h"
-#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/content/browser/autocheckout/whitelist_manager.h"
 #include "components/autofill/content/browser/autocheckout_manager.h"
+#include "components/autofill/core/browser/autocomplete_history_manager.h"
+#include "components/autofill/core/browser/autofill_data_model.h"
+#include "components/autofill/core/browser/autofill_driver.h"
+#include "components/autofill/core/browser/autofill_external_delegate.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_manager_test_delegate.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/form_structure.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/phone_number.h"
+#include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/autofill_switches.h"
diff --git a/components/autofill/browser/autofill_manager.h b/components/autofill/core/browser/autofill_manager.h
index bac6bc7..0c47328 100644
--- a/components/autofill/browser/autofill_manager.h
+++ b/components/autofill/core/browser/autofill_manager.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_MANAGER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_MANAGER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_
 
 #include <list>
 #include <map>
@@ -19,13 +19,13 @@
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time.h"
-#include "components/autofill/browser/autocomplete_history_manager.h"
-#include "components/autofill/browser/autofill_download.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
-#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/content/browser/autocheckout_manager.h"
+#include "components/autofill/core/browser/autocomplete_history_manager.h"
+#include "components/autofill/core/browser/autofill_download.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/form_structure.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/common/autocheckout_status.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/forms_seen_state.h"
@@ -427,4 +427,4 @@ class AutofillManager : public AutofillDownloadManager::Observer {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_MANAGER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_
diff --git a/components/autofill/browser/autofill_manager_delegate.h b/components/autofill/core/browser/autofill_manager_delegate.h
index 287530a..503bca7 100644
--- a/components/autofill/browser/autofill_manager_delegate.h
+++ b/components/autofill/core/browser/autofill_manager_delegate.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_MANAGER_DELEGATE_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_MANAGER_DELEGATE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_DELEGATE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_DELEGATE_H_
 
 #include <vector>
 
@@ -133,4 +133,4 @@ class AutofillManagerDelegate {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_MANAGER_DELEGATE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_DELEGATE_H_
diff --git a/components/autofill/browser/autofill_manager_test_delegate.h b/components/autofill/core/browser/autofill_manager_test_delegate.h
index ac48b7f..222a8df 100644
--- a/components/autofill/browser/autofill_manager_test_delegate.h
+++ b/components/autofill/core/browser/autofill_manager_test_delegate.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_BROWSER_AUTOFILL_MANAGER_TEST_DELEGATE_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_MANAGER_TEST_DELEGATE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_TEST_DELEGATE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_TEST_DELEGATE_H_
 
 namespace autofill {
 
@@ -23,4 +23,4 @@ class AutofillManagerTestDelegate {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_MANAGER_TEST_DELEGATE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_TEST_DELEGATE_H_
diff --git a/components/autofill/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc
index 328e4e8..ce43c48 100644
--- a/components/autofill/browser/autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -26,16 +26,16 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autocomplete_history_manager.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_manager.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/personal_data_manager.h"
-#include "components/autofill/browser/test_autofill_driver.h"
-#include "components/autofill/browser/test_autofill_external_delegate.h"
-#include "components/autofill/browser/test_autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autocomplete_history_manager.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/test_autofill_driver.h"
+#include "components/autofill/core/browser/test_autofill_external_delegate.h"
+#include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_data.h"
diff --git a/components/autofill/browser/autofill_merge_unittest.cc b/components/autofill/core/browser/autofill_merge_unittest.cc
index 48d54a0..04c55f4 100644
--- a/components/autofill/browser/autofill_merge_unittest.cc
+++ b/components/autofill/core/browser/autofill_merge_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,11 +8,11 @@
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_type.h"
-#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/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/data_driven_test.h"
+#include "components/autofill/core/browser/form_structure.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/common/form_data.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/autofill_metrics.cc b/components/autofill/core/browser/autofill_metrics.cc
index 9e91c0b..2b95147 100644
--- a/components/autofill/browser/autofill_metrics.cc
+++ b/components/autofill/core/browser/autofill_metrics.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/form_structure.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/common/form_data.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/autofill_metrics.h b/components/autofill/core/browser/autofill_metrics.h
index fc15a99..5fde62c 100644
--- a/components/autofill/browser/autofill_metrics.h
+++ b/components/autofill/core/browser/autofill_metrics.h
@@ -1,16 +1,16 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_METRICS_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_METRICS_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_METRICS_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_METRICS_H_
 
 #include <stddef.h>
 #include <string>
 
 #include "base/basictypes.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace base {
 class TimeDelta;
@@ -508,4 +508,4 @@ class AutofillMetrics {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_METRICS_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_METRICS_H_
diff --git a/components/autofill/browser/autofill_metrics_unittest.cc b/components/autofill/core/browser/autofill_metrics_unittest.cc
index b73bc6a..ab16e87 100644
--- a/components/autofill/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/core/browser/autofill_metrics_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -14,13 +14,13 @@
 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_manager.h"
-#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/browser/test_autofill_driver.h"
 #include "components/autofill/content/browser/autocheckout_page_meta_data.h"
+#include "components/autofill/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_manager.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/test_autofill_driver.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/forms_seen_state.h"
diff --git a/components/autofill/browser/autofill_popup_delegate.h b/components/autofill/core/browser/autofill_popup_delegate.h
index 4d990a6..ec9a220 100644
--- a/components/autofill/browser/autofill_popup_delegate.h
+++ b/components/autofill/core/browser/autofill_popup_delegate.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_POPUP_DELEGATE_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_POPUP_DELEGATE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_POPUP_DELEGATE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_POPUP_DELEGATE_H_
 
 #include "base/strings/string16.h"
 
@@ -43,4 +43,4 @@ class AutofillPopupDelegate {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_POPUP_DELEGATE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_POPUP_DELEGATE_H_
diff --git a/components/autofill/browser/autofill_profile.cc b/components/autofill/core/browser/autofill_profile.cc
index 3b9e303..aa57b28 100644
--- a/components/autofill/browser/autofill_profile.cc
+++ b/components/autofill/core/browser/autofill_profile.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_profile.h"
 
 #include <algorithm>
 #include <functional>
@@ -15,13 +15,13 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/address.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_type.h"
-#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/core/browser/address.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/contact_info.h"
+#include "components/autofill/core/browser/phone_number.h"
+#include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/components/autofill/browser/autofill_profile.h b/components/autofill/core/browser/autofill_profile.h
index 00e6134..c01b0f1 100644
--- a/components/autofill/browser/autofill_profile.h
+++ b/components/autofill/core/browser/autofill_profile.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_
 
 #include <stddef.h>
 
@@ -14,12 +14,12 @@
 
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/address.h"
-#include "components/autofill/browser/autofill_data_model.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/contact_info.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/phone_number.h"
+#include "components/autofill/core/browser/address.h"
+#include "components/autofill/core/browser/autofill_data_model.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/contact_info.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/phone_number.h"
 
 namespace autofill {
 
@@ -209,4 +209,4 @@ std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile);
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_
diff --git a/components/autofill/browser/autofill_profile_unittest.cc b/components/autofill/core/browser/autofill_profile_unittest.cc
index 9e49a75..f419e4f 100644
--- a/components/autofill/browser/autofill_profile_unittest.cc
+++ b/components/autofill/core/browser/autofill_profile_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #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/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/component_strings.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/autofill_regex_constants.cc.utf8 b/components/autofill/core/browser/autofill_regex_constants.cc.utf8
index 48e93f2..960f432 100644
--- a/components/autofill/browser/autofill_regex_constants.cc.utf8
+++ b/components/autofill/core/browser/autofill_regex_constants.cc.utf8
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,7 +6,7 @@
 // different compilers, we use a script to convert the UTF8 strings into
 // numeric literals (\x##).
 
-#include "components/autofill/browser/autofill_regex_constants.h"
+#include "components/autofill/core/browser/autofill_regex_constants.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/autofill_regex_constants.h b/components/autofill/core/browser/autofill_regex_constants.h
index a87ab02..1c97dec 100644
--- a/components/autofill/browser/autofill_regex_constants.h
+++ b/components/autofill/core/browser/autofill_regex_constants.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_REGEX_CONSTANTS_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_REGEX_CONSTANTS_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_REGEX_CONSTANTS_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_REGEX_CONSTANTS_H_
 
 namespace autofill {
 
@@ -56,4 +56,4 @@ extern const char kPhoneExtensionRe[];
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_REGEX_CONSTANTS_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_REGEX_CONSTANTS_H_
diff --git a/components/autofill/browser/autofill_regexes.cc b/components/autofill/core/browser/autofill_regexes.cc
index df53267..1258cef 100644
--- a/components/autofill/browser/autofill_regexes.cc
+++ b/components/autofill/core/browser/autofill_regexes.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_regexes.h"
+#include "components/autofill/core/browser/autofill_regexes.h"
 
 #include <map>
 #include <utility>
diff --git a/components/autofill/browser/autofill_regexes.h b/components/autofill/core/browser/autofill_regexes.h
index 1267871..f4b5775 100644
--- a/components/autofill/browser/autofill_regexes.h
+++ b/components/autofill/core/browser/autofill_regexes.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_REGEXES_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_REGEXES_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_REGEXES_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_REGEXES_H_
 
 #include "base/strings/string16.h"
 
@@ -17,4 +17,4 @@ bool MatchesPattern(const base::string16& input,
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_REGEXES_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_REGEXES_H_
diff --git a/components/autofill/browser/autofill_regexes_unittest.cc b/components/autofill/core/browser/autofill_regexes_unittest.cc
index cac9691..4539415 100644
--- a/components/autofill/browser/autofill_regexes_unittest.cc
+++ b/components/autofill/core/browser/autofill_regexes_unittest.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_regexes.h"
+#include "components/autofill/core/browser/autofill_regexes.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_regex_constants.h"
+#include "components/autofill/core/browser/autofill_regex_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/autofill_scanner.cc b/components/autofill/core/browser/autofill_scanner.cc
index cad418c..418362e 100644
--- a/components/autofill/browser/autofill_scanner.cc
+++ b/components/autofill/core/browser/autofill_scanner.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_scanner.h"
+#include "components/autofill/core/browser/autofill_scanner.h"
 
 #include "base/logging.h"
-#include "components/autofill/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_field.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/autofill_scanner.h b/components/autofill/core/browser/autofill_scanner.h
index f1dcf85..2a634e6 100644
--- a/components/autofill/browser/autofill_scanner.h
+++ b/components/autofill/core/browser/autofill_scanner.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_SCANNER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_SCANNER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_SCANNER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_SCANNER_H_
 
 #include <vector>
 
@@ -58,4 +58,4 @@ class AutofillScanner {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_SCANNER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_SCANNER_H_
diff --git a/components/autofill/browser/autofill_server_field_info.h b/components/autofill/core/browser/autofill_server_field_info.h
index bd36d8c..a748af1 100644
--- a/components/autofill/browser/autofill_server_field_info.h
+++ b/components/autofill/core/browser/autofill_server_field_info.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_SERVER_FIELD_INFO_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_SERVER_FIELD_INFO_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_SERVER_FIELD_INFO_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_SERVER_FIELD_INFO_H_
 
 #include <string>
 
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace autofill {
 
@@ -21,4 +21,4 @@ struct AutofillServerFieldInfo {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_SERVER_FIELD_INFO_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_SERVER_FIELD_INFO_H_
diff --git a/components/autofill/browser/autofill_type.cc b/components/autofill/core/browser/autofill_type.cc
index c946d73..aad473b 100644
--- a/components/autofill/browser/autofill_type.cc
+++ b/components/autofill/core/browser/autofill_type.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_type.h"
+#include "components/autofill/core/browser/autofill_type.h"
 
 #include <ostream>
 
diff --git a/components/autofill/browser/autofill_type.h b/components/autofill/core/browser/autofill_type.h
index 34bbbed..4020567 100644
--- a/components/autofill/browser/autofill_type.h
+++ b/components/autofill/core/browser/autofill_type.h
@@ -1,16 +1,16 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_TYPE_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_TYPE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_TYPE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_TYPE_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/strings/string16.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace autofill {
 
@@ -61,4 +61,4 @@ typedef std::map<base::string16, AutofillFieldType> FieldTypeMap;
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_TYPE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_TYPE_H_
diff --git a/components/autofill/browser/autofill_type_unittest.cc b/components/autofill/core/browser/autofill_type_unittest.cc
index 14d4fef..eb68e01 100644
--- a/components/autofill/browser/autofill_type_unittest.cc
+++ b/components/autofill/core/browser/autofill_type_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_type.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/autofill_xml_parser.cc b/components/autofill/core/browser/autofill_xml_parser.cc
index bf8674d..4ab9061 100644
--- a/components/autofill/browser/autofill_xml_parser.cc
+++ b/components/autofill/core/browser/autofill_xml_parser.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/autofill_xml_parser.h"
+#include "components/autofill/core/browser/autofill_xml_parser.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/logging.h"
-#include "components/autofill/browser/autofill_server_field_info.h"
 #include "components/autofill/content/browser/autocheckout_page_meta_data.h"
+#include "components/autofill/core/browser/autofill_server_field_info.h"
 #include "third_party/libjingle/source/talk/xmllite/qname.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/autofill_xml_parser.h b/components/autofill/core/browser/autofill_xml_parser.h
index a3367cb..f95f179 100644
--- a/components/autofill/browser/autofill_xml_parser.h
+++ b/components/autofill/core/browser/autofill_xml_parser.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_XML_PARSER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_XML_PARSER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_XML_PARSER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_XML_PARSER_H_
 
 #include <string>
 #include <vector>
@@ -11,9 +11,9 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/autofill/browser/autofill_server_field_info.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/form_structure.h"
+#include "components/autofill/core/browser/autofill_server_field_info.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/form_structure.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
 
 namespace autofill {
@@ -71,7 +71,7 @@ class AutofillXmlParser : public buzz::XmlParseHandler {
 // Fields are returned in the same order they were sent to the server.
 // autofilltype: The server's guess at what type of field this is.  0
 // is unknown, other types are documented in
-// components/autofill/browser/field_types.h.
+// components/autofill/core/browser/field_types.h.
 class AutofillQueryXmlParser : public AutofillXmlParser {
  public:
   AutofillQueryXmlParser(std::vector<AutofillServerFieldInfo>* field_infos,
@@ -165,4 +165,4 @@ class AutofillUploadXmlParser : public AutofillXmlParser {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_XML_PARSER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_XML_PARSER_H_
diff --git a/components/autofill/browser/autofill_xml_parser_unittest.cc b/components/autofill/core/browser/autofill_xml_parser_unittest.cc
index 0679d29..4ef4f72 100644
--- a/components/autofill/browser/autofill_xml_parser_unittest.cc
+++ b/components/autofill/core/browser/autofill_xml_parser_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,9 +7,9 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
-#include "components/autofill/browser/autofill_xml_parser.h"
-#include "components/autofill/browser/field_types.h"
 #include "components/autofill/content/browser/autocheckout_page_meta_data.h"
+#include "components/autofill/core/browser/autofill_xml_parser.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
 
diff --git a/components/autofill/browser/contact_info.cc b/components/autofill/core/browser/contact_info.cc
index 20b3063..d6d211b 100644
--- a/components/autofill/browser/contact_info.cc
+++ b/components/autofill/core/browser/contact_info.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/contact_info.h"
+#include "components/autofill/core/browser/contact_info.h"
 
 #include <stddef.h>
 #include <ostream>
@@ -12,8 +12,8 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/contact_info.h b/components/autofill/core/browser/contact_info.h
index 3d96636f..dc57bc2 100644
--- a/components/autofill/browser/contact_info.h
+++ b/components/autofill/core/browser/contact_info.h
@@ -1,17 +1,17 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_CONTACT_INFO_H_
-#define COMPONENTS_AUTOFILL_BROWSER_CONTACT_INFO_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_CONTACT_INFO_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_CONTACT_INFO_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/form_group.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/form_group.h"
 
 namespace autofill {
 
@@ -96,4 +96,4 @@ class CompanyInfo : public FormGroup {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_CONTACT_INFO_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_CONTACT_INFO_H_
diff --git a/components/autofill/browser/contact_info_unittest.cc b/components/autofill/core/browser/contact_info_unittest.cc
index 7ca72b7..87e96ad 100644
--- a/components/autofill/browser/contact_info_unittest.cc
+++ b/components/autofill/core/browser/contact_info_unittest.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/contact_info.h"
+#include "components/autofill/core/browser/contact_info.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/credit_card.cc b/components/autofill/core/browser/credit_card.cc
index 2f5417f..b63d627 100644
--- a/components/autofill/browser/credit_card.cc
+++ b/components/autofill/core/browser/credit_card.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/credit_card.h"
+#include "components/autofill/core/browser/credit_card.h"
 
 #include <stddef.h>
 
@@ -17,11 +17,11 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_regexes.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/validation.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_regexes.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/component_strings.h"
 #include "grit/webkit_resources.h"
diff --git a/components/autofill/browser/credit_card.h b/components/autofill/core/browser/credit_card.h
index 412f317..217d07b 100644
--- a/components/autofill/browser/credit_card.h
+++ b/components/autofill/core/browser/credit_card.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_CREDIT_CARD_H_
-#define COMPONENTS_AUTOFILL_BROWSER_CREDIT_CARD_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_
 
 #include <iosfwd>
 #include <string>
@@ -11,8 +11,8 @@
 
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/autofill_data_model.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/autofill_data_model.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace autofill {
 
@@ -160,4 +160,4 @@ extern const char* const kVisaCard;
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_CREDIT_CARD_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_
diff --git a/components/autofill/browser/credit_card_field.cc b/components/autofill/core/browser/credit_card_field.cc
index 6661b40..267f7d9 100644
--- a/components/autofill/browser/credit_card_field.cc
+++ b/components/autofill/core/browser/credit_card_field.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/credit_card_field.h"
+#include "components/autofill/core/browser/credit_card_field.h"
 
 #include <stddef.h>
 
@@ -11,10 +11,10 @@
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_regex_constants.h"
-#include "components/autofill/browser/autofill_scanner.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_regex_constants.h"
+#include "components/autofill/core/browser/autofill_scanner.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/credit_card_field.h b/components/autofill/core/browser/credit_card_field.h
index ecf9eb2..2b5cda3 100644
--- a/components/autofill/browser/credit_card_field.h
+++ b/components/autofill/core/browser/credit_card_field.h
@@ -1,17 +1,17 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_CREDIT_CARD_FIELD_H_
-#define COMPONENTS_AUTOFILL_BROWSER_CREDIT_CARD_FIELD_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_FIELD_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_FIELD_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/form_field.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/form_field.h"
 
 namespace autofill {
 
@@ -72,4 +72,4 @@ class CreditCardField : public FormField {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_CREDIT_CARD_FIELD_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_FIELD_H_
diff --git a/components/autofill/browser/credit_card_field_unittest.cc b/components/autofill/core/browser/credit_card_field_unittest.cc
index d83cdd9..46875f2 100644
--- a/components/autofill/browser/credit_card_field_unittest.cc
+++ b/components/autofill/core/browser/credit_card_field_unittest.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
-#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/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_scanner.h"
+#include "components/autofill/core/browser/credit_card_field.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/autofill/browser/credit_card_unittest.cc b/components/autofill/core/browser/credit_card_unittest.cc
index a0db816..224f776 100644
--- a/components/autofill/browser/credit_card_unittest.cc
+++ b/components/autofill/core/browser/credit_card_unittest.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/guid.h"
 #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/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/webkit_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/crypto/rc4_decryptor.h b/components/autofill/core/browser/crypto/rc4_decryptor.h
index 1918312..095413a 100644
--- a/components/autofill/browser/crypto/rc4_decryptor.h
+++ b/components/autofill/core/browser/crypto/rc4_decryptor.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_CRYPTO_RC4_DECRYPTOR_H_
-#define COMPONENTS_AUTOFILL_BROWSER_CRYPTO_RC4_DECRYPTOR_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_CRYPTO_RC4_DECRYPTOR_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_CRYPTO_RC4_DECRYPTOR_H_
 
 #include <string>
 #include "base/basictypes.h"
@@ -18,7 +18,7 @@ namespace autofill {
 // value 0x0020 at the beginning of the code to enhance security.
 //
 // This class used in
-// components/autofill/browser/autofill_ie_toolbar_import_win.cc.
+// components/autofill/core/browser/autofill_ie_toolbar_import_win.cc.
 //
 // This class should not be used anywhere else!!!
 class RC4Decryptor {
@@ -107,4 +107,4 @@ class RC4Decryptor {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_CRYPTO_RC4_DECRYPTOR_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_CRYPTO_RC4_DECRYPTOR_H_
diff --git a/components/autofill/browser/data_driven_test.cc b/components/autofill/core/browser/data_driven_test.cc
index f04f43a..18c0adb 100644
--- a/components/autofill/browser/data_driven_test.cc
+++ b/components/autofill/core/browser/data_driven_test.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/data_driven_test.h"
+#include "components/autofill/core/browser/data_driven_test.h"
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
diff --git a/components/autofill/browser/data_driven_test.h b/components/autofill/core/browser/data_driven_test.h
index 2fac87c..4cbb5a0 100644
--- a/components/autofill/browser/data_driven_test.h
+++ b/components/autofill/core/browser/data_driven_test.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_DATA_DRIVEN_TEST_H_
-#define COMPONENTS_AUTOFILL_BROWSER_DATA_DRIVEN_TEST_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_DATA_DRIVEN_TEST_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_DATA_DRIVEN_TEST_H_
 
 #include <string>
 
@@ -51,4 +51,4 @@ class DataDrivenTest {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_DATA_DRIVEN_TEST_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_DATA_DRIVEN_TEST_H_
diff --git a/components/autofill/browser/email_field.cc b/components/autofill/core/browser/email_field.cc
index 7b1497a..7162c90 100644
--- a/components/autofill/browser/email_field.cc
+++ b/components/autofill/core/browser/email_field.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/email_field.h"
+#include "components/autofill/core/browser/email_field.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_regex_constants.h"
-#include "components/autofill/browser/autofill_scanner.h"
+#include "components/autofill/core/browser/autofill_regex_constants.h"
+#include "components/autofill/core/browser/autofill_scanner.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/email_field.h b/components/autofill/core/browser/email_field.h
index 7e01cfb..b6a08ea 100644
--- a/components/autofill/browser/email_field.h
+++ b/components/autofill/core/browser/email_field.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_EMAIL_FIELD_H_
-#define COMPONENTS_AUTOFILL_BROWSER_EMAIL_FIELD_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_EMAIL_FIELD_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_EMAIL_FIELD_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "components/autofill/browser/form_field.h"
+#include "components/autofill/core/browser/form_field.h"
 
 namespace autofill {
 
@@ -29,4 +29,4 @@ class EmailField : public FormField {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_EMAIL_FIELD_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_EMAIL_FIELD_H_
diff --git a/components/autofill/browser/field_types.h b/components/autofill/core/browser/field_types.h
index c4dce25..6c45a77 100644
--- a/components/autofill/browser/field_types.h
+++ b/components/autofill/core/browser/field_types.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_FIELD_TYPES_H_
-#define COMPONENTS_AUTOFILL_BROWSER_FIELD_TYPES_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_FIELD_TYPES_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_FIELD_TYPES_H_
 
 #include <set>
 #include <string>
@@ -98,4 +98,4 @@ typedef std::set<AutofillFieldType> FieldTypeSet;
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_FIELD_TYPES_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_FIELD_TYPES_H_
diff --git a/components/autofill/browser/form_field.cc b/components/autofill/core/browser/form_field.cc
index 809bd3c..0bffc05 100644
--- a/components/autofill/browser/form_field.cc
+++ b/components/autofill/core/browser/form_field.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/form_field.h"
+#include "components/autofill/core/browser/form_field.h"
 
 #include <stddef.h>
 #include <string>
@@ -13,16 +13,16 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/address_field.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_regexes.h"
-#include "components/autofill/browser/autofill_scanner.h"
-#include "components/autofill/browser/credit_card_field.h"
-#include "components/autofill/browser/email_field.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/form_structure.h"
-#include "components/autofill/browser/name_field.h"
-#include "components/autofill/browser/phone_field.h"
+#include "components/autofill/core/browser/address_field.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_regexes.h"
+#include "components/autofill/core/browser/autofill_scanner.h"
+#include "components/autofill/core/browser/credit_card_field.h"
+#include "components/autofill/core/browser/email_field.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/form_structure.h"
+#include "components/autofill/core/browser/name_field.h"
+#include "components/autofill/core/browser/phone_field.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/form_field.h b/components/autofill/core/browser/form_field.h
index afa5bbe..67099b2 100644
--- a/components/autofill/browser/form_field.h
+++ b/components/autofill/core/browser/form_field.h
@@ -1,16 +1,16 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_FORM_FIELD_H_
-#define COMPONENTS_AUTOFILL_BROWSER_FORM_FIELD_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_FIELD_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_FIELD_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/autofill_type.h"
+#include "components/autofill/core/browser/autofill_type.h"
 
 namespace autofill {
 
@@ -121,4 +121,4 @@ class FormField {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_FORM_FIELD_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_FIELD_H_
diff --git a/components/autofill/browser/form_field_unittest.cc b/components/autofill/core/browser/form_field_unittest.cc
index d3e90fa..9a535bb 100644
--- a/components/autofill/browser/form_field_unittest.cc
+++ b/components/autofill/core/browser/form_field_unittest.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/form_field.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/form_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/form_group.cc b/components/autofill/core/browser/form_group.cc
index 3b33dcb..052d2b7 100644
--- a/components/autofill/browser/form_group.cc
+++ b/components/autofill/core/browser/form_group.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/form_group.h"
+#include "components/autofill/core/browser/form_group.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/form_group.h b/components/autofill/core/browser/form_group.h
index 4af6d55..714112c 100644
--- a/components/autofill/browser/form_group.h
+++ b/components/autofill/core/browser/form_group.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_FORM_GROUP_H_
-#define COMPONENTS_AUTOFILL_BROWSER_FORM_GROUP_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_GROUP_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_GROUP_H_
 
 #include <string>
 
 #include "base/strings/string16.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace autofill {
 
@@ -63,4 +63,4 @@ class FormGroup {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_FORM_GROUP_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_GROUP_H_
diff --git a/components/autofill/browser/form_structure.cc b/components/autofill/core/browser/form_structure.cc
index a03d260..b85e73e 100644
--- a/components/autofill/browser/form_structure.cc
+++ b/components/autofill/core/browser/form_structure.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/form_structure.h"
+#include "components/autofill/core/browser/form_structure.h"
 
 #include <utility>
 
@@ -16,12 +16,12 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/autofill_type.h"
-#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/content/browser/autocheckout_page_meta_data.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/autofill_xml_parser.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/form_field.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_data_predictions.h"
diff --git a/components/autofill/browser/form_structure.h b/components/autofill/core/browser/form_structure.h
index b5fdb1f..4a4fb8d 100644
--- a/components/autofill/browser/form_structure.h
+++ b/components/autofill/core/browser/form_structure.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_FORM_STRUCTURE_H_
-#define COMPONENTS_AUTOFILL_BROWSER_FORM_STRUCTURE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_
 
 #include <string>
 #include <vector>
@@ -11,9 +11,9 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/field_types.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/common/web_element_descriptor.h"
 #include "googleurl/src/gurl.h"
 
@@ -259,4 +259,4 @@ class FormStructure {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_FORM_STRUCTURE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_
diff --git a/components/autofill/browser/form_structure_unittest.cc b/components/autofill/core/browser/form_structure_unittest.cc
index 6d90d6c..90018ef 100644
--- a/components/autofill/browser/form_structure_unittest.cc
+++ b/components/autofill/core/browser/form_structure_unittest.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/form_structure.h"
+#include "components/autofill/core/browser/form_structure.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_metrics.h"
 #include "components/autofill/content/browser/autocheckout_page_meta_data.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "googleurl/src/gurl.h"
diff --git a/components/autofill/browser/name_field.cc b/components/autofill/core/browser/name_field.cc
index 60c5bf2..435537e 100644
--- a/components/autofill/browser/name_field.cc
+++ b/components/autofill/core/browser/name_field.cc
@@ -1,16 +1,16 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/name_field.h"
+#include "components/autofill/core/browser/name_field.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_regex_constants.h"
-#include "components/autofill/browser/autofill_scanner.h"
-#include "components/autofill/browser/autofill_type.h"
+#include "components/autofill/core/browser/autofill_regex_constants.h"
+#include "components/autofill/core/browser/autofill_scanner.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/name_field.h b/components/autofill/core/browser/name_field.h
index a434bc1..ada8a30 100644
--- a/components/autofill/browser/name_field.h
+++ b/components/autofill/core/browser/name_field.h
@@ -1,16 +1,16 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_NAME_FIELD_H_
-#define COMPONENTS_AUTOFILL_BROWSER_NAME_FIELD_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_NAME_FIELD_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_NAME_FIELD_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/form_field.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/form_field.h"
 
 namespace autofill {
 
@@ -43,4 +43,4 @@ class NameField : public FormField {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_NAME_FIELD_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_NAME_FIELD_H_
diff --git a/components/autofill/browser/name_field_unittest.cc b/components/autofill/core/browser/name_field_unittest.cc
index a98d598..0abe631 100644
--- a/components/autofill/browser/name_field_unittest.cc
+++ b/components/autofill/core/browser/name_field_unittest.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_scanner.h"
-#include "components/autofill/browser/name_field.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_scanner.h"
+#include "components/autofill/core/browser/name_field.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/autofill/browser/password_autofill_manager.cc b/components/autofill/core/browser/password_autofill_manager.cc
index 7f780ad..b568f8d 100644
--- a/components/autofill/browser/password_autofill_manager.cc
+++ b/components/autofill/core/browser/password_autofill_manager.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/password_autofill_manager.h"
+#include "components/autofill/core/browser/password_autofill_manager.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
diff --git a/components/autofill/browser/password_autofill_manager.h b/components/autofill/core/browser/password_autofill_manager.h
index d326d18..97af87f 100644
--- a/components/autofill/browser/password_autofill_manager.h
+++ b/components/autofill/core/browser/password_autofill_manager.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_PASSWORD_AUTOFILL_MANAGER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_PASSWORD_AUTOFILL_MANAGER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PASSWORD_AUTOFILL_MANAGER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_PASSWORD_AUTOFILL_MANAGER_H_
 
 // This file was contains some repeated code from
 // chrome/renderer/autofill/password_autofill_manager because as we move to the
@@ -72,4 +72,4 @@ class PasswordAutofillManager {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_PASSWORD_AUTOFILL_MANAGER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PASSWORD_AUTOFILL_MANAGER_H_
diff --git a/components/autofill/browser/password_autofill_manager_unittest.cc b/components/autofill/core/browser/password_autofill_manager_unittest.cc
index 15386db..d7c5cfd 100644
--- a/components/autofill/browser/password_autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/password_autofill_manager_unittest.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/compiler_specific.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/password_autofill_manager.h"
+#include "components/autofill/core/browser/password_autofill_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/components/autofill/browser/password_generator.cc b/components/autofill/core/browser/password_generator.cc
index 1967706..6f09b6c 100644
--- a/components/autofill/browser/password_generator.cc
+++ b/components/autofill/core/browser/password_generator.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/password_generator.h"
+#include "components/autofill/core/browser/password_generator.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/components/autofill/browser/password_generator.h b/components/autofill/core/browser/password_generator.h
index 0872bee..a57695c 100644
--- a/components/autofill/browser/password_generator.h
+++ b/components/autofill/core/browser/password_generator.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_PASSWORD_GENERATOR_H_
-#define COMPONENTS_AUTOFILL_BROWSER_PASSWORD_GENERATOR_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PASSWORD_GENERATOR_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_PASSWORD_GENERATOR_H_
 
 #include <string>
 
@@ -45,4 +45,4 @@ class PasswordGenerator {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_PASSWORD_GENERATOR_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PASSWORD_GENERATOR_H_
diff --git a/components/autofill/browser/password_generator_unittest.cc b/components/autofill/core/browser/password_generator_unittest.cc
index 3be72a5..6d91189 100644
--- a/components/autofill/browser/password_generator_unittest.cc
+++ b/components/autofill/core/browser/password_generator_unittest.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <locale>
 
-#include "components/autofill/browser/password_generator.h"
+#include "components/autofill/core/browser/password_generator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc
index 021944b..f8eb6c1 100644
--- a/components/autofill/browser/personal_data_manager.cc
+++ b/components/autofill/core/browser/personal_data_manager.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
@@ -14,16 +14,16 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill-inl.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/form_structure.h"
-#include "components/autofill/browser/personal_data_manager_observer.h"
-#include "components/autofill/browser/phone_number.h"
-#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/core/browser/autofill-inl.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/form_structure.h"
+#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/autofill/core/browser/validation.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/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.h b/components/autofill/core/browser/personal_data_manager.h
index 6a8b8c9..36e578f 100644
--- a/components/autofill/browser/personal_data_manager.h
+++ b/components/autofill/core/browser/personal_data_manager.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_PERSONAL_DATA_MANAGER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_PERSONAL_DATA_MANAGER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
 
 #include <set>
 #include <vector>
@@ -13,10 +13,10 @@
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
+#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/autofill/core/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/webdata/common/web_data_service_consumer.h"
 
 class RemoveAutofillTester;
@@ -288,4 +288,4 @@ class PersonalDataManager : public WebDataServiceConsumer,
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_PERSONAL_DATA_MANAGER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
diff --git a/components/autofill/browser/personal_data_manager_mac.mm b/components/autofill/core/browser/personal_data_manager_mac.mm
index 08487bd..d63283f 100644
--- a/components/autofill/browser/personal_data_manager_mac.mm
+++ b/components/autofill/core/browser/personal_data_manager_mac.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 
 #include <math.h>
 
@@ -16,9 +16,9 @@
 #include "base/memory/scoped_vector.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/phone_number.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/phone_number.h"
 #include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
diff --git a/components/autofill/browser/personal_data_manager_observer.h b/components/autofill/core/browser/personal_data_manager_observer.h
index b8fea94..d4a24ca 100644
--- a/components/autofill/browser/personal_data_manager_observer.h
+++ b/components/autofill/core/browser/personal_data_manager_observer.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_PERSONAL_DATA_MANAGER_OBSERVER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_PERSONAL_DATA_MANAGER_OBSERVER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_OBSERVER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_OBSERVER_H_
 
 namespace autofill {
 
@@ -22,4 +22,4 @@ class PersonalDataManagerObserver {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_PERSONAL_DATA_MANAGER_OBSERVER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_OBSERVER_H_
diff --git a/components/autofill/browser/personal_data_manager_unittest.cc b/components/autofill/core/browser/personal_data_manager_unittest.cc
index 551fe44..86d0322 100644
--- a/components/autofill/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/core/browser/personal_data_manager_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -12,13 +12,13 @@
 #include "base/synchronization/waitable_event.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autofill_common_test.h"
-#include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/form_structure.h"
-#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/core/browser/autofill_common_test.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/form_structure.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/webdata/encryptor/encryptor.h"
 #include "content/public/browser/notification_details.h"
diff --git a/components/autofill/browser/phone_field.cc b/components/autofill/core/browser/phone_field.cc
index 28eefb4..ee1e4e6c 100644
--- a/components/autofill/browser/phone_field.cc
+++ b/components/autofill/core/browser/phone_field.cc
@@ -1,17 +1,17 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/phone_field.h"
+#include "components/autofill/core/browser/phone_field.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_regex_constants.h"
-#include "components/autofill/browser/autofill_scanner.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_regex_constants.h"
+#include "components/autofill/core/browser/autofill_scanner.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/phone_field.h b/components/autofill/core/browser/phone_field.h
index e82c1e3..cb5b732 100644
--- a/components/autofill/browser/phone_field.h
+++ b/components/autofill/core/browser/phone_field.h
@@ -1,16 +1,16 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_PHONE_FIELD_H_
-#define COMPONENTS_AUTOFILL_BROWSER_PHONE_FIELD_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_FIELD_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_FIELD_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/form_field.h"
-#include "components/autofill/browser/phone_number.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/form_field.h"
+#include "components/autofill/core/browser/phone_number.h"
 
 namespace autofill {
 
@@ -90,4 +90,4 @@ class PhoneField : public FormField {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_PHONE_FIELD_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_FIELD_H_
diff --git a/components/autofill/browser/phone_field_unittest.cc b/components/autofill/core/browser/phone_field_unittest.cc
index 8db2a90..46a5e0d 100644
--- a/components/autofill/browser/phone_field_unittest.cc
+++ b/components/autofill/core/browser/phone_field_unittest.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_field.h"
-#include "components/autofill/browser/autofill_scanner.h"
-#include "components/autofill/browser/phone_field.h"
+#include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_scanner.h"
+#include "components/autofill/core/browser/phone_field.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/autofill/browser/phone_number.cc b/components/autofill/core/browser/phone_number.cc
index 41f6364..9dc1b34 100644
--- a/components/autofill/browser/phone_number.cc
+++ b/components/autofill/core/browser/phone_number.cc
@@ -1,18 +1,18 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/phone_number.h"
+#include "components/autofill/core/browser/phone_number.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/phone_number_i18n.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/phone_number_i18n.h"
 
 namespace autofill {
 namespace {
diff --git a/components/autofill/browser/phone_number.h b/components/autofill/core/browser/phone_number.h
index 26feea3..32ed209 100644
--- a/components/autofill/browser/phone_number.h
+++ b/components/autofill/core/browser/phone_number.h
@@ -1,18 +1,18 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_PHONE_NUMBER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_PHONE_NUMBER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/form_group.h"
-#include "components/autofill/browser/phone_number_i18n.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/form_group.h"
+#include "components/autofill/core/browser/phone_number_i18n.h"
 
 namespace autofill {
 
@@ -95,4 +95,4 @@ class PhoneNumber : public FormGroup {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_PHONE_NUMBER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_H_
diff --git a/components/autofill/browser/phone_number_i18n.cc b/components/autofill/core/browser/phone_number_i18n.cc
index d8ad08eb..1cb49ca 100644
--- a/components/autofill/browser/phone_number_i18n.cc
+++ b/components/autofill/core/browser/phone_number_i18n.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/phone_number_i18n.h"
+#include "components/autofill/core/browser/phone_number_i18n.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ -10,7 +10,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_country.h"
 #include "third_party/libphonenumber/src/phonenumber_api.h"
 
 using i18n::phonenumbers::PhoneNumber;
diff --git a/components/autofill/browser/phone_number_i18n.h b/components/autofill/core/browser/phone_number_i18n.h
index b2de4df..3fcc824 100644
--- a/components/autofill/browser/phone_number_i18n.h
+++ b/components/autofill/core/browser/phone_number_i18n.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_PHONE_NUMBER_I18N_H_
-#define COMPONENTS_AUTOFILL_BROWSER_PHONE_NUMBER_I18N_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_I18N_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_I18N_H_
 
 #include <string>
 #include <vector>
@@ -109,4 +109,4 @@ class PhoneObject {
 }  // namespace i18n
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_PHONE_NUMBER_I18N_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_I18N_H_
diff --git a/components/autofill/browser/phone_number_i18n_unittest.cc b/components/autofill/core/browser/phone_number_i18n_unittest.cc
index 610cbd7..dba9e40 100644
--- a/components/autofill/browser/phone_number_i18n_unittest.cc
+++ b/components/autofill/core/browser/phone_number_i18n_unittest.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/phone_number_i18n.h"
+#include "components/autofill/core/browser/phone_number_i18n.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libphonenumber/src/phonenumber_api.h"
diff --git a/components/autofill/browser/phone_number_unittest.cc b/components/autofill/core/browser/phone_number_unittest.cc
index 54fc7bc..417fb59 100644
--- a/components/autofill/browser/phone_number_unittest.cc
+++ b/components/autofill/core/browser/phone_number_unittest.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/phone_number.h"
-#include "components/autofill/browser/phone_number_i18n.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/phone_number.h"
+#include "components/autofill/core/browser/phone_number_i18n.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/state_names.cc b/components/autofill/core/browser/state_names.cc
index 339cd1a..d285887 100644
--- a/components/autofill/browser/state_names.cc
+++ b/components/autofill/core/browser/state_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/browser/state_names.h"
+#include "components/autofill/core/browser/state_names.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
diff --git a/components/autofill/browser/state_names.h b/components/autofill/core/browser/state_names.h
index e691d57..cd71539 100644
--- a/components/autofill/browser/state_names.h
+++ b/components/autofill/core/browser/state_names.h
@@ -4,8 +4,8 @@
 
 #include "base/strings/string16.h"
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_STATE_NAMES_H_
-#define COMPONENTS_AUTOFILL_BROWSER_STATE_NAMES_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_STATE_NAMES_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_STATE_NAMES_H_
 
 namespace autofill {
 namespace state_names {
@@ -28,4 +28,4 @@ void GetNameAndAbbreviation(const base::string16& value,
 }  // namespace state_names
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_STATE_NAMES_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_STATE_NAMES_H_
diff --git a/components/autofill/browser/test_autofill_driver.cc b/components/autofill/core/browser/test_autofill_driver.cc
index 3fb24eab..5d642ee 100644
--- a/components/autofill/browser/test_autofill_driver.cc
+++ b/components/autofill/core/browser/test_autofill_driver.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/browser/test_autofill_driver.h"
+#include "components/autofill/core/browser/test_autofill_driver.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/test_autofill_driver.h b/components/autofill/core/browser/test_autofill_driver.h
index 6ad09db..b63b7a4 100644
--- a/components/autofill/browser/test_autofill_driver.h
+++ b/components/autofill/core/browser/test_autofill_driver.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_TEST_AUTOFILL_DRIVER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_TEST_AUTOFILL_DRIVER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_DRIVER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_DRIVER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "components/autofill/browser/autofill_driver.h"
+#include "components/autofill/core/browser/autofill_driver.h"
 #include "content/public/browser/web_contents_observer.h"
 
 namespace autofill {
@@ -31,4 +31,4 @@ class TestAutofillDriver : public AutofillDriver,
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_TEST_AUTOFILL_DRIVER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_DRIVER_H_
diff --git a/components/autofill/browser/test_autofill_external_delegate.cc b/components/autofill/core/browser/test_autofill_external_delegate.cc
index e9643d8..94e6b9e 100644
--- a/components/autofill/browser/test_autofill_external_delegate.cc
+++ b/components/autofill/core/browser/test_autofill_external_delegate.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/test_autofill_external_delegate.h"
+#include "components/autofill/core/browser/test_autofill_external_delegate.h"
 
 #include "ui/gfx/rect.h"
 
diff --git a/components/autofill/browser/test_autofill_external_delegate.h b/components/autofill/core/browser/test_autofill_external_delegate.h
index 637bffd..cc7bf73 100644
--- a/components/autofill/browser/test_autofill_external_delegate.h
+++ b/components/autofill/core/browser/test_autofill_external_delegate.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_TEST_AUTOFILL_EXTERNAL_DELEGATE_H_
-#define COMPONENTS_AUTOFILL_BROWSER_TEST_AUTOFILL_EXTERNAL_DELEGATE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_EXTERNAL_DELEGATE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_EXTERNAL_DELEGATE_H_
 
-#include "components/autofill/browser/autofill_external_delegate.h"
+#include "components/autofill/core/browser/autofill_external_delegate.h"
 
 namespace autofill {
 
@@ -18,4 +18,4 @@ void GenerateTestAutofillPopup(
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_TEST_AUTOFILL_EXTERNAL_DELEGATE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_EXTERNAL_DELEGATE_H_
diff --git a/components/autofill/browser/test_autofill_manager_delegate.cc b/components/autofill/core/browser/test_autofill_manager_delegate.cc
index 69e615b..49516a5 100644
--- a/components/autofill/browser/test_autofill_manager_delegate.cc
+++ b/components/autofill/core/browser/test_autofill_manager_delegate.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/test_autofill_manager_delegate.h"
+#include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/test_autofill_manager_delegate.h b/components/autofill/core/browser/test_autofill_manager_delegate.h
index fc3dc41..ad61405 100644
--- a/components/autofill/browser/test_autofill_manager_delegate.h
+++ b/components/autofill/core/browser/test_autofill_manager_delegate.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_TEST_AUTOFILL_MANAGER_DELEGATE_H_
-#define COMPONENTS_AUTOFILL_BROWSER_TEST_AUTOFILL_MANAGER_DELEGATE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_MANAGER_DELEGATE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_MANAGER_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
-#include "components/autofill/browser/autofill_manager_delegate.h"
+#include "components/autofill/core/browser/autofill_manager_delegate.h"
 
 namespace autofill {
 
@@ -59,4 +59,4 @@ class TestAutofillManagerDelegate : public AutofillManagerDelegate {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_TEST_AUTOFILL_MANAGER_DELEGATE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_MANAGER_DELEGATE_H_
diff --git a/components/autofill/browser/test_personal_data_manager.cc b/components/autofill/core/browser/test_personal_data_manager.cc
index 1d904d8..0a517d7 100644
--- a/components/autofill/browser/test_personal_data_manager.cc
+++ b/components/autofill/core/browser/test_personal_data_manager.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/test_personal_data_manager.h"
+#include "components/autofill/core/browser/test_personal_data_manager.h"
 
-#include "components/autofill/browser/personal_data_manager_observer.h"
+#include "components/autofill/core/browser/personal_data_manager_observer.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/test_personal_data_manager.h b/components/autofill/core/browser/test_personal_data_manager.h
index e6f1800..c9f9a43 100644
--- a/components/autofill/browser/test_personal_data_manager.h
+++ b/components/autofill/core/browser/test_personal_data_manager.h
@@ -7,9 +7,9 @@
 
 #include <vector>
 
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/validation.cc b/components/autofill/core/browser/validation.cc
index 657e227..ca8c780 100644
--- a/components/autofill/browser/validation.cc
+++ b/components/autofill/core/browser/validation.cc
@@ -1,17 +1,17 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/validation.h"
+#include "components/autofill/core/browser/validation.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
-#include "components/autofill/browser/autofill_regexes.h"
-#include "components/autofill/browser/credit_card.h"
-#include "components/autofill/browser/state_names.h"
+#include "components/autofill/core/browser/autofill_regexes.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/state_names.h"
 
 using base::StringPiece16;
 
diff --git a/components/autofill/browser/validation.h b/components/autofill/core/browser/validation.h
index ad0c86c..a5ddd2e 100644
--- a/components/autofill/browser/validation.h
+++ b/components/autofill/core/browser/validation.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_VALIDATION_H_
-#define COMPONENTS_AUTOFILL_BROWSER_VALIDATION_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_VALIDATION_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_VALIDATION_H_
 
 #include "base/strings/string16.h"
 
@@ -47,4 +47,4 @@ bool IsSSN(const string16& text);
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_VALIDATION_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_VALIDATION_H_
diff --git a/components/autofill/browser/validation_unittest.cc b/components/autofill/core/browser/validation_unittest.cc
index eda933e..ec96769 100644
--- a/components/autofill/browser/validation_unittest.cc
+++ b/components/autofill/core/browser/validation_unittest.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
-#include "components/autofill/browser/validation.h"
+#include "components/autofill/core/browser/validation.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/webdata/autofill_change.cc b/components/autofill/core/browser/webdata/autofill_change.cc
index 7136c97..c02bdd8 100644
--- a/components/autofill/browser/webdata/autofill_change.cc
+++ b/components/autofill/core/browser/webdata/autofill_change.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/webdata/autofill_change.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
 
 #include "base/logging.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/webdata/autofill_change.h b/components/autofill/core/browser/webdata/autofill_change.h
index 215313e..458ac6d 100644
--- a/components/autofill/browser/webdata/autofill_change.h
+++ b/components/autofill/core/browser/webdata/autofill_change.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_CHANGE_H__
-#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_CHANGE_H__
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_CHANGE_H__
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_CHANGE_H__
 
 #include <vector>
 
-#include "components/autofill/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
 
 namespace autofill {
 
@@ -73,4 +73,4 @@ class AutofillProfileChange : public GenericAutofillChange<std::string> {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_CHANGE_H__
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_CHANGE_H__
diff --git a/components/autofill/browser/webdata/autofill_entry.cc b/components/autofill/core/browser/webdata/autofill_entry.cc
index 1f5ab6b..5cdc237 100644
--- a/components/autofill/browser/webdata/autofill_entry.cc
+++ b/components/autofill/core/browser/webdata/autofill_entry.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
 
 #include <algorithm>
 #include <set>
diff --git a/components/autofill/browser/webdata/autofill_entry.h b/components/autofill/core/browser/webdata/autofill_entry.h
index 94b633a..4e274d8 100644
--- a/components/autofill/browser/webdata/autofill_entry.h
+++ b/components/autofill/core/browser/webdata/autofill_entry.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_ENTRY_H__
-#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_ENTRY_H__
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_ENTRY_H__
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_ENTRY_H__
 
 #include <stddef.h>
 #include <vector>
@@ -72,4 +72,4 @@ class AutofillEntry {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_ENTRY_H__
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_ENTRY_H__
diff --git a/components/autofill/browser/webdata/autofill_entry_unittest.cc b/components/autofill/core/browser/webdata/autofill_entry_unittest.cc
index d235547..dfcd884 100644
--- a/components/autofill/browser/webdata/autofill_entry_unittest.cc
+++ b/components/autofill/core/browser/webdata/autofill_entry_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,7 +6,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
-#include "components/autofill/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/webdata/autofill_table.cc b/components/autofill/core/browser/webdata/autofill_table.cc
index 50bdd62..4163b87 100644
--- a/components/autofill/browser/webdata/autofill_table.cc
+++ b/components/autofill/core/browser/webdata/autofill_table.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
 
 #include <algorithm>
 #include <limits>
@@ -17,13 +17,13 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/time.h"
 #include "base/tuple.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/credit_card.h"
-#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/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/webdata/common/web_database.h"
 #include "components/webdata/encryptor/encryptor.h"
diff --git a/components/autofill/browser/webdata/autofill_table.h b/components/autofill/core/browser/webdata/autofill_table.h
index 2e78fea..52012e2 100644
--- a/components/autofill/browser/webdata/autofill_table.h
+++ b/components/autofill/core/browser/webdata/autofill_table.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
 
 #include <vector>
 
@@ -385,4 +385,4 @@ class AutofillTable : public WebDatabaseTable {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
diff --git a/components/autofill/browser/webdata/autofill_table_unittest.cc b/components/autofill/core/browser/webdata/autofill_table_unittest.cc
index 5945a61..5bea76d 100644
--- a/components/autofill/browser/webdata/autofill_table_unittest.cc
+++ b/components/autofill/core/browser/webdata/autofill_table_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -12,12 +12,12 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/credit_card.h"
-#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/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
+#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/webdata/common/web_database.h"
 #include "components/webdata/encryptor/encryptor.h"
diff --git a/components/autofill/browser/webdata/autofill_webdata.h b/components/autofill/core/browser/webdata/autofill_webdata.h
index 6630e8a..fbd4107 100644
--- a/components/autofill/browser/webdata/autofill_webdata.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_H_
 
 #include <string>
 #include <vector>
@@ -104,4 +104,4 @@ class AutofillWebData {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_H_
diff --git a/components/autofill/browser/webdata/autofill_webdata_backend.h b/components/autofill/core/browser/webdata/autofill_webdata_backend.h
index 383fc7a..2f46301 100644
--- a/components/autofill/browser/webdata/autofill_webdata_backend.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata_backend.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_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_H_
 
 class WebDatabase;
 
@@ -40,4 +40,4 @@ class AutofillWebDataBackend {
 
 } // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_H_
diff --git a/components/autofill/browser/webdata/autofill_webdata_backend_impl.cc b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.cc
index 477d6e1..b3da704 100644
--- a/components/autofill/browser/webdata/autofill_webdata_backend_impl.cc
+++ b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.cc
@@ -1,19 +1,19 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/webdata/autofill_webdata_backend_impl.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#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/browser/webdata/autofill_webdata_service_observer.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/webdata/common/web_data_service_backend.h"
 
diff --git a/components/autofill/browser/webdata/autofill_webdata_backend_impl.h b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
index e96f0c8..8015dd4 100644
--- a/components/autofill/browser/webdata/autofill_webdata_backend_impl.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_IMPL_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_IMPL_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_IMPL_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #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/core/browser/webdata/autofill_webdata.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_backend.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/webdata/common/web_data_results.h"
 #include "components/webdata/common/web_data_service_base.h"
@@ -182,4 +182,4 @@ class AutofillWebDataBackendImpl
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_IMPL_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_IMPL_H_
diff --git a/components/autofill/browser/webdata/autofill_webdata_service.cc b/components/autofill/core/browser/webdata/autofill_webdata_service.cc
index 7557be7..bc4f65a 100644
--- a/components/autofill/browser/webdata/autofill_webdata_service.cc
+++ b/components/autofill/core/browser/webdata/autofill_webdata_service.cc
@@ -1,19 +1,19 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#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/browser/webdata/autofill_webdata_backend_impl.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/autofill/core/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/core/browser/webdata/autofill_webdata_service.h
index 175978f..59907fd 100644
--- a/components/autofill/browser/webdata/autofill_webdata_service.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata_service.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
 
 #include <vector>
 
@@ -11,7 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/supports_user_data.h"
-#include "components/autofill/browser/webdata/autofill_webdata.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/webdata/common/web_data_results.h"
 #include "components/webdata/common/web_data_service_base.h"
@@ -123,4 +123,4 @@ class AutofillWebDataService : public AutofillWebData,
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
diff --git a/components/autofill/browser/webdata/autofill_webdata_service_observer.h b/components/autofill/core/browser/webdata/autofill_webdata_service_observer.h
index f57e326..f4333e5 100644
--- a/components/autofill/browser/webdata/autofill_webdata_service_observer.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata_service_observer.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
 
-#include "components/autofill/browser/webdata/autofill_change.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
 
 namespace autofill {
 
@@ -34,4 +34,4 @@ class AutofillWebDataServiceObserverOnUIThread {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
diff --git a/components/autofill/browser/webdata/web_data_service_unittest.cc b/components/autofill/core/browser/webdata/web_data_service_unittest.cc
index 746df1b..d1eaf17 100644
--- a/components/autofill/browser/webdata/web_data_service_unittest.cc
+++ b/components/autofill/core/browser/webdata/web_data_service_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -18,14 +18,14 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
 #include "chrome/browser/webdata/web_data_service.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/credit_card.h"
-#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/browser/webdata/autofill_webdata_service.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/webdata/common/web_data_results.h"
 #include "components/webdata/common/web_data_service_base.h"
diff --git a/components/webdata/common/web_data_service_test_util.cc b/components/webdata/common/web_data_service_test_util.cc
index 2720721..b1f3429 100644
--- a/components/webdata/common/web_data_service_test_util.cc
+++ b/components/webdata/common/web_data_service_test_util.cc
@@ -4,7 +4,7 @@
 
 #include "components/webdata/common/web_data_service_test_util.h"
 
-#include "components/autofill/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 
 using autofill::AutofillWebDataService;
 
diff --git a/components/webdata/common/web_database_migration_unittest.cc b/components/webdata/common/web_database_migration_unittest.cc
index 0181f2e..d93fce5 100644
--- a/components/webdata/common/web_database_migration_unittest.cc
+++ b/components/webdata/common/web_database_migration_unittest.cc
@@ -20,13 +20,13 @@
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/autofill/browser/autofill_country.h"
-#include "components/autofill/browser/autofill_profile.h"
-#include "components/autofill/browser/autofill_type.h"
-#include "components/autofill/browser/credit_card.h"
-#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/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/webdata/autofill_change.h"
+#include "components/autofill/core/browser/webdata/autofill_entry.h"
+#include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/webdata/common/web_database.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"