summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--android_webview/browser/DEPS1
-rw-r--r--android_webview/browser/aw_autofill_manager_delegate.cc2
-rw-r--r--chrome/browser/autofill/autocheckout_whitelist_manager_factory.cc2
-rw-r--r--chrome/chrome_tests_unit.gypi6
-rw-r--r--components/autofill.gypi16
-rw-r--r--components/autofill/browser/autofill_manager.cc4
-rw-r--r--components/autofill/browser/autofill_manager.h2
-rw-r--r--components/autofill/browser/autofill_metrics_unittest.cc2
-rw-r--r--components/autofill/browser/autofill_xml_parser.cc2
-rw-r--r--components/autofill/browser/autofill_xml_parser_unittest.cc2
-rw-r--r--components/autofill/browser/form_structure.cc2
-rw-r--r--components/autofill/browser/form_structure_unittest.cc2
-rw-r--r--components/autofill/content/browser/autocheckout/whitelist_manager.cc (renamed from components/autofill/browser/autocheckout/whitelist_manager.cc)4
-rw-r--r--components/autofill/content/browser/autocheckout/whitelist_manager.h (renamed from components/autofill/browser/autocheckout/whitelist_manager.h)8
-rw-r--r--components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc (renamed from components/autofill/browser/autocheckout/whitelist_manager_unittest.cc)4
-rw-r--r--components/autofill/content/browser/autocheckout_manager.cc (renamed from components/autofill/browser/autocheckout_manager.cc)6
-rw-r--r--components/autofill/content/browser/autocheckout_manager.h (renamed from components/autofill/browser/autocheckout_manager.h)10
-rw-r--r--components/autofill/content/browser/autocheckout_manager_unittest.cc (renamed from components/autofill/browser/autocheckout_manager_unittest.cc)4
-rw-r--r--components/autofill/content/browser/autocheckout_page_meta_data.cc (renamed from components/autofill/browser/autocheckout_page_meta_data.cc)4
-rw-r--r--components/autofill/content/browser/autocheckout_page_meta_data.h (renamed from components/autofill/browser/autocheckout_page_meta_data.h)8
-rw-r--r--components/autofill/content/browser/autocheckout_page_meta_data_unittest.cc (renamed from components/autofill/browser/autocheckout_page_meta_data_unittest.cc)4
-rw-r--r--components/autofill/content/browser/autocheckout_request_manager.cc (renamed from components/autofill/browser/autocheckout_request_manager.cc)2
-rw-r--r--components/autofill/content/browser/autocheckout_request_manager.h (renamed from components/autofill/browser/autocheckout_request_manager.h)6
23 files changed, 52 insertions, 51 deletions
diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS
index 58b826e..23d70e4 100644
--- a/android_webview/browser/DEPS
+++ b/android_webview/browser/DEPS
@@ -9,6 +9,7 @@ include_rules = [
"+components/auto_login_parser",
"+components/autofill/browser",
"+components/autofill/common",
+ "+components/autofill/content/browser",
"+components/navigation_interception",
"+components/user_prefs",
"+components/visitedlink/browser",
diff --git a/android_webview/browser/aw_autofill_manager_delegate.cc b/android_webview/browser/aw_autofill_manager_delegate.cc
index bc9c726..09ea866 100644
--- a/android_webview/browser/aw_autofill_manager_delegate.cc
+++ b/android_webview/browser/aw_autofill_manager_delegate.cc
@@ -10,9 +10,9 @@
#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/pref_service.h"
#include "base/prefs/pref_service_builder.h"
-#include "components/autofill/browser/autocheckout/whitelist_manager.h"
#include "components/autofill/browser/webdata/autofill_webdata_service.h"
#include "components/autofill/common/autofill_pref_names.h"
+#include "components/autofill/content/browser/autocheckout/whitelist_manager.h"
#include "components/user_prefs/user_prefs.h"
namespace {
diff --git a/chrome/browser/autofill/autocheckout_whitelist_manager_factory.cc b/chrome/browser/autofill/autocheckout_whitelist_manager_factory.cc
index a38c9dc..3e355da 100644
--- a/chrome/browser/autofill/autocheckout_whitelist_manager_factory.cc
+++ b/chrome/browser/autofill/autocheckout_whitelist_manager_factory.cc
@@ -8,7 +8,7 @@
#include "base/memory/singleton.h"
#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
-#include "components/autofill/browser/autocheckout/whitelist_manager.h"
+#include "components/autofill/content/browser/autocheckout/whitelist_manager.h"
#include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
namespace autofill {
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 23461ba..ff45fb1 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1751,9 +1751,6 @@
'../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/autocheckout/whitelist_manager_unittest.cc',
- '../components/autofill/browser/autocheckout_manager_unittest.cc',
- '../components/autofill/browser/autocheckout_page_meta_data_unittest.cc',
'../components/autofill/browser/autocomplete_history_manager_unittest.cc',
'../components/autofill/browser/autofill_country_unittest.cc',
'../components/autofill/browser/autofill_data_model_unittest.cc',
@@ -1782,6 +1779,9 @@
'../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',
'../components/autofill/content/browser/wallet/encryption_escrow_client_unittest.cc',
'../components/autofill/content/browser/wallet/full_wallet_unittest.cc',
'../components/autofill/content/browser/wallet/instrument_unittest.cc',
diff --git a/components/autofill.gypi b/components/autofill.gypi
index db048d9..3d2f446 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -122,14 +122,6 @@
'autofill/browser/address.h',
'autofill/browser/address_field.cc',
'autofill/browser/address_field.h',
- 'autofill/browser/autocheckout/whitelist_manager.cc',
- 'autofill/browser/autocheckout/whitelist_manager.h',
- 'autofill/browser/autocheckout_manager.cc',
- 'autofill/browser/autocheckout_manager.h',
- 'autofill/browser/autocheckout_page_meta_data.cc',
- 'autofill/browser/autocheckout_page_meta_data.h',
- 'autofill/browser/autocheckout_request_manager.cc',
- 'autofill/browser/autocheckout_request_manager.h',
'autofill/browser/autocomplete_history_manager.cc',
'autofill/browser/autocomplete_history_manager.h',
'autofill/browser/autofill-inl.h',
@@ -280,6 +272,14 @@
'component_resources.gyp:component_resources',
],
'sources': [
+ 'autofill/content/browser/autocheckout/whitelist_manager.cc',
+ 'autofill/content/browser/autocheckout/whitelist_manager.h',
+ 'autofill/content/browser/autocheckout_manager.cc',
+ 'autofill/content/browser/autocheckout_manager.h',
+ 'autofill/content/browser/autocheckout_page_meta_data.cc',
+ 'autofill/content/browser/autocheckout_page_meta_data.h',
+ 'autofill/content/browser/autocheckout_request_manager.cc',
+ 'autofill/content/browser/autocheckout_request_manager.h',
'autofill/content/browser/risk/fingerprint.cc',
'autofill/content/browser/risk/fingerprint.h',
'autofill/content/browser/wallet/encryption_escrow_client.cc',
diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/browser/autofill_manager.cc
index 666974f..5f71055 100644
--- a/components/autofill/browser/autofill_manager.cc
+++ b/components/autofill/browser/autofill_manager.cc
@@ -20,8 +20,6 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
-#include "components/autofill/browser/autocheckout/whitelist_manager.h"
-#include "components/autofill/browser/autocheckout_manager.h"
#include "components/autofill/browser/autocomplete_history_manager.h"
#include "components/autofill/browser/autofill_data_model.h"
#include "components/autofill/browser/autofill_external_delegate.h"
@@ -43,6 +41,8 @@
#include "components/autofill/common/form_data_predictions.h"
#include "components/autofill/common/form_field_data.h"
#include "components/autofill/common/password_form_fill_data.h"
+#include "components/autofill/content/browser/autocheckout/whitelist_manager.h"
+#include "components/autofill/content/browser/autocheckout_manager.h"
#include "components/user_prefs/pref_registry_syncable.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
diff --git a/components/autofill/browser/autofill_manager.h b/components/autofill/browser/autofill_manager.h
index d164923..4a35662 100644
--- a/components/autofill/browser/autofill_manager.h
+++ b/components/autofill/browser/autofill_manager.h
@@ -20,7 +20,6 @@
#include "base/strings/string16.h"
#include "base/supports_user_data.h"
#include "base/time.h"
-#include "components/autofill/browser/autocheckout_manager.h"
#include "components/autofill/browser/autocomplete_history_manager.h"
#include "components/autofill/browser/autofill_download.h"
#include "components/autofill/browser/autofill_manager_delegate.h"
@@ -30,6 +29,7 @@
#include "components/autofill/common/autocheckout_status.h"
#include "components/autofill/common/form_data.h"
#include "components/autofill/common/forms_seen_state.h"
+#include "components/autofill/content/browser/autocheckout_manager.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/ssl_status.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
diff --git a/components/autofill/browser/autofill_metrics_unittest.cc b/components/autofill/browser/autofill_metrics_unittest.cc
index d716226..b763788 100644
--- a/components/autofill/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/browser/autofill_metrics_unittest.cc
@@ -14,7 +14,6 @@
#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/autocheckout_page_meta_data.h"
#include "components/autofill/browser/autofill_common_test.h"
#include "components/autofill/browser/autofill_manager.h"
#include "components/autofill/browser/autofill_manager_delegate.h"
@@ -23,6 +22,7 @@
#include "components/autofill/common/form_data.h"
#include "components/autofill/common/form_field_data.h"
#include "components/autofill/common/forms_seen_state.h"
+#include "components/autofill/content/browser/autocheckout_page_meta_data.h"
#include "components/webdata/common/web_data_results.h"
#include "content/public/test/test_utils.h"
#include "googleurl/src/gurl.h"
diff --git a/components/autofill/browser/autofill_xml_parser.cc b/components/autofill/browser/autofill_xml_parser.cc
index 01d2810..bf8674d 100644
--- a/components/autofill/browser/autofill_xml_parser.cc
+++ b/components/autofill/browser/autofill_xml_parser.cc
@@ -8,8 +8,8 @@
#include <string.h>
#include "base/logging.h"
-#include "components/autofill/browser/autocheckout_page_meta_data.h"
#include "components/autofill/browser/autofill_server_field_info.h"
+#include "components/autofill/content/browser/autocheckout_page_meta_data.h"
#include "third_party/libjingle/source/talk/xmllite/qname.h"
namespace autofill {
diff --git a/components/autofill/browser/autofill_xml_parser_unittest.cc b/components/autofill/browser/autofill_xml_parser_unittest.cc
index b0922c0..0679d29 100644
--- a/components/autofill/browser/autofill_xml_parser_unittest.cc
+++ b/components/autofill/browser/autofill_xml_parser_unittest.cc
@@ -7,9 +7,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_number_conversions.h"
-#include "components/autofill/browser/autocheckout_page_meta_data.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 "testing/gtest/include/gtest/gtest.h"
#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
diff --git a/components/autofill/browser/form_structure.cc b/components/autofill/browser/form_structure.cc
index f9738ee..41647ae 100644
--- a/components/autofill/browser/form_structure.cc
+++ b/components/autofill/browser/form_structure.cc
@@ -16,7 +16,6 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "components/autofill/browser/autocheckout_page_meta_data.h"
#include "components/autofill/browser/autofill_metrics.h"
#include "components/autofill/browser/autofill_type.h"
#include "components/autofill/browser/autofill_xml_parser.h"
@@ -27,6 +26,7 @@
#include "components/autofill/common/form_data_predictions.h"
#include "components/autofill/common/form_field_data.h"
#include "components/autofill/common/form_field_data_predictions.h"
+#include "components/autofill/content/browser/autocheckout_page_meta_data.h"
#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
namespace autofill {
diff --git a/components/autofill/browser/form_structure_unittest.cc b/components/autofill/browser/form_structure_unittest.cc
index feb1c56..05a48a2 100644
--- a/components/autofill/browser/form_structure_unittest.cc
+++ b/components/autofill/browser/form_structure_unittest.cc
@@ -7,10 +7,10 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autocheckout_page_meta_data.h"
#include "components/autofill/browser/autofill_metrics.h"
#include "components/autofill/common/form_data.h"
#include "components/autofill/common/form_field_data.h"
+#include "components/autofill/content/browser/autocheckout_page_meta_data.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
diff --git a/components/autofill/browser/autocheckout/whitelist_manager.cc b/components/autofill/content/browser/autocheckout/whitelist_manager.cc
index ed67d52..63d99e7 100644
--- a/components/autofill/browser/autocheckout/whitelist_manager.cc
+++ b/components/autofill/content/browser/autocheckout/whitelist_manager.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/autocheckout/whitelist_manager.h"
+#include "components/autofill/content/browser/autocheckout/whitelist_manager.h"
#include "base/command_line.h"
#include "base/logging.h"
diff --git a/components/autofill/browser/autocheckout/whitelist_manager.h b/components/autofill/content/browser/autocheckout/whitelist_manager.h
index bd60721..1132b51 100644
--- a/components/autofill/browser/autocheckout/whitelist_manager.h
+++ b/components/autofill/content/browser/autocheckout/whitelist_manager.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_AUTOCHECKOUT_WHITELIST_MANAGER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOCHECKOUT_WHITELIST_MANAGER_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_WHITELIST_MANAGER_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_WHITELIST_MANAGER_H_
#include <string>
#include <vector>
@@ -103,5 +103,5 @@ class WhitelistManager : public net::URLFetcherDelegate {
} // namespace autocheckout
} // namespace autofill
-#endif // COMPONENTS_AUTOFILL_BROWSER_AUTOCHECKOUT_WHITELIST_MANAGER_H_
+#endif // COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_WHITELIST_MANAGER_H_
diff --git a/components/autofill/browser/autocheckout/whitelist_manager_unittest.cc b/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc
index 4fc3e6e..dafaa04 100644
--- a/components/autofill/browser/autocheckout/whitelist_manager_unittest.cc
+++ b/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc
@@ -1,4 +1,4 @@
-// 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.
@@ -6,9 +6,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/autocheckout/whitelist_manager.h"
#include "components/autofill/browser/autofill_metrics.h"
#include "components/autofill/common/autofill_switches.h"
+#include "components/autofill/content/browser/autocheckout/whitelist_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_errors.h"
diff --git a/components/autofill/browser/autocheckout_manager.cc b/components/autofill/content/browser/autocheckout_manager.cc
index c978553..4853d31 100644
--- a/components/autofill/browser/autocheckout_manager.cc
+++ b/components/autofill/content/browser/autocheckout_manager.cc
@@ -1,13 +1,12 @@
-// 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/autocheckout_manager.h"
+#include "components/autofill/content/browser/autocheckout_manager.h"
#include "base/basictypes.h"
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/autocheckout_request_manager.h"
#include "components/autofill/browser/autofill_country.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/autofill_manager.h"
@@ -20,6 +19,7 @@
#include "components/autofill/common/form_data.h"
#include "components/autofill/common/form_field_data.h"
#include "components/autofill/common/web_element_descriptor.h"
+#include "components/autofill/content/browser/autocheckout_request_manager.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_view_host.h"
diff --git a/components/autofill/browser/autocheckout_manager.h b/components/autofill/content/browser/autocheckout_manager.h
index ed4fb63..6f44fa8 100644
--- a/components/autofill/browser/autocheckout_manager.h
+++ b/components/autofill/content/browser/autocheckout_manager.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_AUTOCHECKOUT_MANAGER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOCHECKOUT_MANAGER_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_MANAGER_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_MANAGER_H_
#include <string>
@@ -12,8 +12,8 @@
#include "base/memory/weak_ptr.h"
#include "base/strings/string16.h"
#include "base/threading/thread_checker.h"
-#include "components/autofill/browser/autocheckout_page_meta_data.h"
#include "components/autofill/common/autocheckout_status.h"
+#include "components/autofill/content/browser/autocheckout_page_meta_data.h"
class GURL;
@@ -157,4 +157,4 @@ class AutocheckoutManager {
} // namespace autofill
-#endif // COMPONENTS_AUTOFILL_BROWSER_AUTOCHECKOUT_MANAGER_H_
+#endif // COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_MANAGER_H_
diff --git a/components/autofill/browser/autocheckout_manager_unittest.cc b/components/autofill/content/browser/autocheckout_manager_unittest.cc
index 3e12e86..bfcd7da 100644
--- a/components/autofill/browser/autocheckout_manager_unittest.cc
+++ b/components/autofill/content/browser/autocheckout_manager_unittest.cc
@@ -1,4 +1,4 @@
-// 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.
@@ -6,7 +6,6 @@
#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/autocheckout_manager.h"
#include "components/autofill/browser/autofill_common_test.h"
#include "components/autofill/browser/autofill_manager.h"
#include "components/autofill/browser/autofill_metrics.h"
@@ -14,6 +13,7 @@
#include "components/autofill/browser/test_autofill_manager_delegate.h"
#include "components/autofill/common/autofill_messages.h"
#include "components/autofill/common/form_data.h"
+#include "components/autofill/content/browser/autocheckout_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/mock_render_process_host.h"
#include "content/public/test/test_browser_thread.h"
diff --git a/components/autofill/browser/autocheckout_page_meta_data.cc b/components/autofill/content/browser/autocheckout_page_meta_data.cc
index aa48ca7..c6d0685 100644
--- a/components/autofill/browser/autocheckout_page_meta_data.cc
+++ b/components/autofill/content/browser/autocheckout_page_meta_data.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/autocheckout_page_meta_data.h"
+#include "components/autofill/content/browser/autocheckout_page_meta_data.h"
namespace autofill {
diff --git a/components/autofill/browser/autocheckout_page_meta_data.h b/components/autofill/content/browser/autocheckout_page_meta_data.h
index 997a66e..a845396 100644
--- a/components/autofill/browser/autocheckout_page_meta_data.h
+++ b/components/autofill/content/browser/autocheckout_page_meta_data.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_AUTOCHECKOUT_PAGE_META_DATA_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOCHECKOUT_PAGE_META_DATA_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_PAGE_META_DATA_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_PAGE_META_DATA_H_
#include <vector>
@@ -63,4 +63,4 @@ struct AutocheckoutPageMetaData {
} // namespace autofill
-#endif // COMPONENTS_AUTOFILL_BROWSER_AUTOCHECKOUT_PAGE_META_DATA_H_
+#endif // COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_PAGE_META_DATA_H_
diff --git a/components/autofill/browser/autocheckout_page_meta_data_unittest.cc b/components/autofill/content/browser/autocheckout_page_meta_data_unittest.cc
index bb3f2da..0e74060 100644
--- a/components/autofill/browser/autocheckout_page_meta_data_unittest.cc
+++ b/components/autofill/content/browser/autocheckout_page_meta_data_unittest.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/autocheckout_page_meta_data.h"
+#include "components/autofill/content/browser/autocheckout_page_meta_data.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/components/autofill/browser/autocheckout_request_manager.cc b/components/autofill/content/browser/autocheckout_request_manager.cc
index 45760b4..103ad43 100644
--- a/components/autofill/browser/autocheckout_request_manager.cc
+++ b/components/autofill/content/browser/autocheckout_request_manager.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/autocheckout_request_manager.h"
+#include "components/autofill/content/browser/autocheckout_request_manager.h"
#include "components/autofill/browser/autofill_manager_delegate.h"
#include "content/public/browser/browser_context.h"
diff --git a/components/autofill/browser/autocheckout_request_manager.h b/components/autofill/content/browser/autocheckout_request_manager.h
index c9cb525..c740c5a 100644
--- a/components/autofill/browser/autocheckout_request_manager.h
+++ b/components/autofill/content/browser/autocheckout_request_manager.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_AUTOCHECKOUT_REQUEST_MANAGER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_AUTOCHECKOUT_REQUEST_MANAGER_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_REQUEST_MANAGER_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_REQUEST_MANAGER_H_
#include "base/supports_user_data.h"
#include "components/autofill/browser/autofill_metrics.h"
@@ -98,4 +98,4 @@ class AutocheckoutRequestManager : public base::SupportsUserData::Data,
} // namespace autofill
-#endif // COMPONENTS_AUTOFILL_BROWSER_AUTOCHECKOUT_REQUEST_MANAGER_H_
+#endif // COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOCHECKOUT_REQUEST_MANAGER_H_