In components/autofill, move browser/autocheckout* to content/browser/

    
This change is part of moving components/autofill into its eventual structure
as a layered component.

TBR=joi,thakis,benm

BUG=247015

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

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

18 files changed, 38 insertions, 38 deletions

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_