Move webdata/autofill code into autofill component

All code moved using tools/git/move_source_file.py

Only manual changes were to DEPS and gypi files.

TBR= ben@chromium.org, joi@chromium.org, robertshield@chromium.org
(moving files from webdata to autofill component).
BUG=181277,140037

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

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

22 files changed, 91 insertions, 106 deletions

diff --git a/components/autofill.gypi b/components/autofill.gypi
index feab2e4..50a1d3f 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -95,67 +95,12 @@
         },
 
         {
-          # A few types used by autofill_browser that are also referenced in
-          # other components.
-          'target_name': 'autofill_browser_types',
-          'type': 'static_library',
-          'include_dirs': [
-            '..',
-          ],
-          'dependencies': [
-            'autofill_common',
-            'autofill_regexes',
-            '../base/base.gyp:base',
-            '../third_party/icu/icu.gyp:icui18n',
-            '../third_party/icu/icu.gyp:icuuc',
-            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
-            '../ui/ui.gyp:ui',
-            '../webkit/support/webkit_support.gyp:webkit_resources',
-
-            # For grip/generated_resources.h
-            # TODO(kaiwang): Remove this dependency on chrome.
-            '../chrome/chrome_resources.gyp:chrome_strings',
-          ],
-          'sources': [
-            'autofill/browser/address.cc',
-            'autofill/browser/address.h',
-            'autofill/browser/autofill_country.cc',
-            'autofill/browser/autofill_country.h',
-            'autofill/browser/autofill_field.cc',
-            'autofill/browser/autofill_field.h',
-            'autofill/browser/autofill_profile.cc',
-            'autofill/browser/autofill_profile.h',
-            'autofill/browser/autofill_regexes.cc',
-            'autofill/browser/autofill_regexes.h',
-            'autofill/browser/autofill_type.cc',
-            'autofill/browser/autofill_type.h',
-            'autofill/browser/contact_info.cc',
-            'autofill/browser/contact_info.h',
-            'autofill/browser/credit_card.cc',
-            'autofill/browser/credit_card.h',
-            'autofill/browser/field_types.h',
-            'autofill/browser/form_group.cc',
-            'autofill/browser/form_group.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/validation.cc',
-            'autofill/browser/validation.h',
-          ],
-
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [4267, ],
-        },
-
-        {
           'target_name': 'autofill_browser',
           'type': 'static_library',
           'include_dirs': [
             '..',
           ],
           'dependencies': [
-            'autofill_browser_types',
             'autofill_common',
             'autofill_regexes',
             'autofill_risk_proto',
@@ -165,7 +110,11 @@
             '../content/content.gyp:content_common',
             '../ipc/ipc.gyp:ipc',
             '../skia/skia.gyp:skia',
+            '../third_party/icu/icu.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icuuc',
             '../third_party/libjingle/libjingle.gyp:libjingle',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
+            '../ui/ui.gyp:ui',
             '../webkit/support/webkit_support.gyp:webkit_resources',
 
             # For grip/generated_resources.h and grit/chromium_strings.h
@@ -175,6 +124,8 @@
             # TODO(kaiwang): Add webdata after it's fully componentized.
           ],
           'sources': [
+            'autofill/browser/address.cc',
+            'autofill/browser/address.h',
             'autofill/browser/address_field.cc',
             'autofill/browser/address_field.h',
             'autofill/browser/autocheckout/whitelist_manager.cc',
@@ -188,12 +139,16 @@
             '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_download.cc',
             'autofill/browser/autofill_download.h',
             'autofill/browser/autofill_download_url.cc',
             'autofill/browser/autofill_download_url.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',
@@ -203,19 +158,32 @@
             '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',
@@ -230,8 +198,14 @@
             '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/risk/fingerprint.cc',
             'autofill/browser/risk/fingerprint.h',
+            'autofill/browser/validation.cc',
+            'autofill/browser/validation.h',
             'autofill/browser/wallet/cart.cc',
             'autofill/browser/wallet/cart.h',
             'autofill/browser/wallet/encryption_escrow_client.cc',
@@ -254,6 +228,16 @@
             'autofill/browser/wallet/wallet_service_url.h',
             'autofill/browser/wallet/wallet_signin_helper.cc',
             'autofill/browser/wallet/wallet_signin_helper.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_service.cc',
+            'autofill/browser/webdata/autofill_webdata_service.h',
+            'autofill/browser/webdata/autofill_webdata_service_observer.h',
 
             # This file is generated by the autofill_regexes action.
             '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
diff --git a/components/autofill/browser/DEPS b/components/autofill/browser/DEPS
index 90dd89e..d513e2b 100644
--- a/components/autofill/browser/DEPS
+++ b/components/autofill/browser/DEPS
@@ -1,10 +1,11 @@
 include_rules = [
-  "+components/webdata/autofill",
+  "+components/webdata/common",
   "+content/public/browser",
   "+crypto/random.h",
   "+google_apis/gaia",
   "+google_apis/google_api_keys.h",
   "+net",
+  "+sql",
   "+third_party/libjingle",
   "+third_party/libphonenumber",  # For phone number i18n.
   "+webkit/plugins/webplugininfo.h",
diff --git a/components/autofill/browser/autocomplete_history_manager.h b/components/autofill/browser/autocomplete_history_manager.h
index 60a9f08..7cf00db 100644
--- a/components/autofill/browser/autocomplete_history_manager.h
+++ b/components/autofill/browser/autocomplete_history_manager.h
@@ -9,7 +9,7 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/prefs/pref_member.h"
-#include "components/webdata/autofill/autofill_webdata_service.h"
+#include "components/autofill/browser/webdata/autofill_webdata_service.h"
 #include "components/webdata/common/web_data_service_consumer.h"
 #include "content/public/browser/web_contents_observer.h"
 
diff --git a/components/autofill/browser/autocomplete_history_manager_unittest.cc b/components/autofill/browser/autocomplete_history_manager_unittest.cc
index 3b4bc38..08bc9e1 100644
--- a/components/autofill/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/browser/autocomplete_history_manager_unittest.cc
@@ -16,8 +16,8 @@
 #include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/test_autofill_manager_delegate.h"
+#include "components/autofill/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/common/form_data.h"
-#include "components/webdata/autofill/autofill_webdata_service.h"
 #include "components/webdata/common/web_data_service_test_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/components/autofill/browser/personal_data_manager.cc b/components/autofill/browser/personal_data_manager.cc
index 6fa3c45..9ce89c6 100644
--- a/components/autofill/browser/personal_data_manager.cc
+++ b/components/autofill/browser/personal_data_manager.cc
@@ -13,8 +13,8 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "components/autofill/browser/autofill_country.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_group.h"
@@ -23,9 +23,9 @@
 #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/common/autofill_pref_names.h"
 #include "components/user_prefs/user_prefs.h"
-#include "components/webdata/autofill/autofill_webdata_service.h"
 #include "content/public/browser/browser_context.h"
 
 using content::BrowserContext;
diff --git a/components/autofill/browser/personal_data_manager.h b/components/autofill/browser/personal_data_manager.h
index 311a52a..75d1e6b 100644
--- a/components/autofill/browser/personal_data_manager.h
+++ b/components/autofill/browser/personal_data_manager.h
@@ -16,7 +16,7 @@
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/field_types.h"
-#include "components/webdata/autofill/autofill_webdata_service_observer.h"
+#include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/webdata/common/web_data_service_consumer.h"
 
 class AutofillMetrics;
diff --git a/components/autofill/browser/personal_data_manager_unittest.cc b/components/autofill/browser/personal_data_manager_unittest.cc
index d7e1061..dd62b87 100644
--- a/components/autofill/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/browser/personal_data_manager_unittest.cc
@@ -18,8 +18,8 @@
 #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/common/form_data.h"
-#include "components/webdata/autofill/autofill_webdata_service.h"
 #include "components/webdata/encryptor/encryptor.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
diff --git a/components/webdata/autofill/autofill_change.cc b/components/autofill/browser/webdata/autofill_change.cc
index 4a6d9fb..0b58602 100644
--- a/components/webdata/autofill/autofill_change.cc
+++ b/components/autofill/browser/webdata/autofill_change.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/webdata/autofill/autofill_change.h"
+#include "components/autofill/browser/webdata/autofill_change.h"
 
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
diff --git a/components/webdata/autofill/autofill_change.h b/components/autofill/browser/webdata/autofill_change.h
index e05e4d7..386f540 100644
--- a/components/webdata/autofill/autofill_change.h
+++ b/components/autofill/browser/webdata/autofill_change.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_WEBDATA_AUTOFILL_AUTOFILL_CHANGE_H__
-#define COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_CHANGE_H__
+#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_CHANGE_H__
+#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_CHANGE_H__
 
 #include <vector>
 
-#include "components/webdata/autofill/autofill_entry.h"
+#include "components/autofill/browser/webdata/autofill_entry.h"
 
 class AutofillProfile;
 class CreditCard;
@@ -69,4 +69,4 @@ class AutofillProfileChange : public GenericAutofillChange<std::string> {
   const AutofillProfile* profile_;
 };
 
-#endif  // COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_CHANGE_H__
+#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_CHANGE_H__
diff --git a/components/webdata/autofill/autofill_entry.cc b/components/autofill/browser/webdata/autofill_entry.cc
index dda5cf5..713f6bc 100644
--- a/components/webdata/autofill/autofill_entry.cc
+++ b/components/autofill/browser/webdata/autofill_entry.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/webdata/autofill/autofill_entry.h"
+#include "components/autofill/browser/webdata/autofill_entry.h"
 
 #include <algorithm>
 #include <set>
diff --git a/components/webdata/autofill/autofill_entry.h b/components/autofill/browser/webdata/autofill_entry.h
index 0aed9b1..14509eca 100644
--- a/components/webdata/autofill/autofill_entry.h
+++ b/components/autofill/browser/webdata/autofill_entry.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_WEBDATA_AUTOFILL_AUTOFILL_ENTRY_H__
-#define COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_ENTRY_H__
+#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_ENTRY_H__
+#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_ENTRY_H__
 
 #include <stddef.h>
 #include <vector>
@@ -68,4 +68,4 @@ class AutofillEntry {
   bool timestamps_culled_;
 };
 
-#endif  // COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_ENTRY_H__
+#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_ENTRY_H__
diff --git a/components/webdata/autofill/autofill_entry_unittest.cc b/components/autofill/browser/webdata/autofill_entry_unittest.cc
index 481877b..c5940bb 100644
--- a/components/webdata/autofill/autofill_entry_unittest.cc
+++ b/components/autofill/browser/webdata/autofill_entry_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "components/webdata/autofill/autofill_entry.h"
+#include "components/autofill/browser/webdata/autofill_entry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 const unsigned int kMaxAutofillTimeStamps = 2;
diff --git a/components/webdata/autofill/autofill_table.cc b/components/autofill/browser/webdata/autofill_table.cc
index 34dc348..9b76aae 100644
--- a/components/webdata/autofill/autofill_table.cc
+++ b/components/autofill/browser/webdata/autofill_table.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/webdata/autofill/autofill_table.h"
+#include "components/autofill/browser/webdata/autofill_table.h"
 
 #include <algorithm>
 #include <limits>
@@ -22,9 +22,9 @@
 #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/common/form_field_data.h"
-#include "components/webdata/autofill/autofill_change.h"
-#include "components/webdata/autofill/autofill_entry.h"
 #include "components/webdata/common/web_database.h"
 #include "components/webdata/encryptor/encryptor.h"
 #include "sql/statement.h"
diff --git a/components/webdata/autofill/autofill_table.h b/components/autofill/browser/webdata/autofill_table.h
index c0c24bb..24afba8 100644
--- a/components/webdata/autofill/autofill_table.h
+++ b/components/autofill/browser/webdata/autofill_table.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_WEBDATA_AUTOFILL_AUTOFILL_TABLE_H_
-#define COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_TABLE_H_
+#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
+#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
 
 #include <vector>
 
@@ -363,4 +363,4 @@ class AutofillTable : public WebDatabaseTable {
   DISALLOW_COPY_AND_ASSIGN(AutofillTable);
 };
 
-#endif  // COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_TABLE_H_
+#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
diff --git a/components/webdata/autofill/autofill_table_unittest.cc b/components/autofill/browser/webdata/autofill_table_unittest.cc
index 34be794..deb2314 100644
--- a/components/webdata/autofill/autofill_table_unittest.cc
+++ b/components/autofill/browser/webdata/autofill_table_unittest.cc
@@ -14,10 +14,10 @@
 #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/common/form_field_data.h"
-#include "components/webdata/autofill/autofill_change.h"
-#include "components/webdata/autofill/autofill_entry.h"
-#include "components/webdata/autofill/autofill_table.h"
 #include "components/webdata/common/web_database.h"
 #include "components/webdata/encryptor/encryptor.h"
 #include "sql/statement.h"
diff --git a/components/webdata/autofill/autofill_webdata.h b/components/autofill/browser/webdata/autofill_webdata.h
index c81afc1..58f683b 100644
--- a/components/webdata/autofill/autofill_webdata.h
+++ b/components/autofill/browser/webdata/autofill_webdata.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_WEBDATA_AUTOFILL_AUTOFILL_WEBDATA_H_
-#define COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_WEBDATA_H_
+#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_H_
+#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_H_
 
 #include <string>
 #include <vector>
@@ -85,4 +85,4 @@ class AutofillWebData {
       const base::Time& delete_begin, const base::Time& delete_end) = 0;
 };
 
-#endif  // COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_WEBDATA_H_
+#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_H_
diff --git a/components/webdata/autofill/autofill_webdata_service.cc b/components/autofill/browser/webdata/autofill_webdata_service.cc
index 60a47c0..2ec7f4d 100644
--- a/components/webdata/autofill/autofill_webdata_service.cc
+++ b/components/autofill/browser/webdata/autofill_webdata_service.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/webdata/autofill/autofill_webdata_service.h"
+#include "components/autofill/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_service_observer.h"
 #include "components/autofill/common/form_field_data.h"
-#include "components/webdata/autofill/autofill_change.h"
-#include "components/webdata/autofill/autofill_entry.h"
-#include "components/webdata/autofill/autofill_table.h"
-#include "components/webdata/autofill/autofill_webdata_service_observer.h"
 #include "components/webdata/common/web_database_service.h"
 
 using base::Bind;
diff --git a/components/webdata/autofill/autofill_webdata_service.h b/components/autofill/browser/webdata/autofill_webdata_service.h
index b5ef156..f1573fd 100644
--- a/components/webdata/autofill/autofill_webdata_service.h
+++ b/components/autofill/browser/webdata/autofill_webdata_service.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_WEBDATA_AUTOFILL_AUTOFILL_WEBDATA_SERVICE_H_
-#define COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_WEBDATA_SERVICE_H_
+#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
+#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
+#include "components/autofill/browser/webdata/autofill_webdata.h"
 #include "components/autofill/common/form_field_data.h"
-#include "components/webdata/autofill/autofill_webdata.h"
 #include "components/webdata/common/web_data_results.h"
 #include "components/webdata/common/web_data_service_base.h"
 #include "components/webdata/common/web_data_service_consumer.h"
@@ -129,4 +129,4 @@ class AutofillWebDataService : public AutofillWebData,
   DISALLOW_COPY_AND_ASSIGN(AutofillWebDataService);
 };
 
-#endif  // COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_WEBDATA_SERVICE_H_
+#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
diff --git a/components/webdata/autofill/autofill_webdata_service_observer.h b/components/autofill/browser/webdata/autofill_webdata_service_observer.h
index ed032ab..f6a6e43 100644
--- a/components/webdata/autofill/autofill_webdata_service_observer.h
+++ b/components/autofill/browser/webdata/autofill_webdata_service_observer.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
-#define COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
+#ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
+#define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
 
-#include "components/webdata/autofill/autofill_change.h"
+#include "components/autofill/browser/webdata/autofill_change.h"
 
 class AutofillWebDataServiceObserverOnDBThread {
  public:
@@ -34,4 +34,4 @@ class AutofillWebDataServiceObserverOnUIThread {
   virtual ~AutofillWebDataServiceObserverOnUIThread() {}
 };
 
-#endif  // COMPONENTS_WEBDATA_AUTOFILL_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
+#endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_OBSERVER_H_
diff --git a/components/webdata/autofill/web_data_service_unittest.cc b/components/autofill/browser/webdata/web_data_service_unittest.cc
index 0f74612..a933925 100644
--- a/components/webdata/autofill/web_data_service_unittest.cc
+++ b/components/autofill/browser/webdata/web_data_service_unittest.cc
@@ -20,12 +20,12 @@
 #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/common/form_field_data.h"
-#include "components/webdata/autofill/autofill_change.h"
-#include "components/webdata/autofill/autofill_entry.h"
-#include "components/webdata/autofill/autofill_table.h"
-#include "components/webdata/autofill/autofill_webdata_service.h"
-#include "components/webdata/autofill/autofill_webdata_service_observer.h"
 #include "components/webdata/common/web_data_service_test_util.h"
 #include "components/webdata/common/web_database_service.h"
 #include "content/public/test/test_browser_thread.h"
diff --git a/components/webdata/common/web_data_service_test_util.cc b/components/webdata/common/web_data_service_test_util.cc
index 13cc591..46d6292 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/webdata/autofill/autofill_webdata_service.h"
+#include "components/autofill/browser/webdata/autofill_webdata_service.h"
 
 MockWebDataServiceWrapperBase::MockWebDataServiceWrapperBase() {
 }
diff --git a/components/webdata/autofill/web_database_migration_unittest.cc b/components/webdata/common/web_database_migration_unittest.cc
index 8c3bb1c..f894e9a 100644
--- a/components/webdata/autofill/web_database_migration_unittest.cc
+++ b/components/webdata/common/web_database_migration_unittest.cc
@@ -24,9 +24,9 @@
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/credit_card.h"
-#include "components/webdata/autofill/autofill_change.h"
-#include "components/webdata/autofill/autofill_entry.h"
-#include "components/webdata/autofill/autofill_table.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/webdata/common/web_database.h"
 #include "content/public/test/test_browser_thread.h"
 #include "sql/statement.h"