In components/autofill, move browser/wallet/ to content/browser/wallet/

This change is part of moving components/autofill into its eventual structure
as a layered component. As part of this move, this CL renames the
autofill_test_util target (which contains only util code for testing wallet) to
autofill_content_test_util.

TBR=joi, thakis
BUG=247015

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

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

46 files changed, 182 insertions, 182 deletions

diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller.h b/chrome/browser/ui/autofill/autofill_dialog_controller.h
index fea9323..d0cf0df 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller.h
@@ -10,7 +10,7 @@
 #include "base/string16.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/wallet/required_action.h"
+#include "components/autofill/content/browser/wallet/required_action.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 0c65489..8784ea7 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
@@ -19,10 +19,10 @@
 #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/browser/wallet/wallet_test_util.h"
 #include "components/autofill/common/autofill_switches.h"
 #include "components/autofill/common/form_data.h"
 #include "components/autofill/common/form_field_data.h"
+#include "components/autofill/content/browser/wallet/wallet_test_util.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
index c537b1a..935b041 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
@@ -40,15 +40,15 @@
 #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/browser/wallet/full_wallet.h"
-#include "components/autofill/browser/wallet/instrument.h"
-#include "components/autofill/browser/wallet/wallet_address.h"
-#include "components/autofill/browser/wallet/wallet_items.h"
-#include "components/autofill/browser/wallet/wallet_service_url.h"
-#include "components/autofill/browser/wallet/wallet_signin_helper.h"
 #include "components/autofill/common/form_data.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/full_wallet.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_items.h"
+#include "components/autofill/content/browser/wallet/wallet_service_url.h"
+#include "components/autofill/content/browser/wallet/wallet_signin_helper.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/geolocation_provider.h"
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index 791ecea..9ddd9ea 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -26,10 +26,10 @@
 #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/wallet/wallet_client.h"
-#include "components/autofill/browser/wallet/wallet_client_delegate.h"
-#include "components/autofill/browser/wallet/wallet_items.h"
-#include "components/autofill/browser/wallet/wallet_signin_helper_delegate.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 "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 24e4dd3..a2b8300 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -18,15 +18,15 @@
 #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/wallet/full_wallet.h"
-#include "components/autofill/browser/wallet/instrument.h"
-#include "components/autofill/browser/wallet/wallet_address.h"
-#include "components/autofill/browser/wallet/wallet_client.h"
-#include "components/autofill/browser/wallet/wallet_service_url.h"
-#include "components/autofill/browser/wallet/wallet_test_util.h"
 #include "components/autofill/common/autofill_switches.h"
 #include "components/autofill/common/form_data.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"
+#include "components/autofill/content/browser/wallet/wallet_address.h"
+#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 "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/web_contents_tester.h"
diff --git a/chrome/browser/ui/autofill/data_model_wrapper.cc b/chrome/browser/ui/autofill/data_model_wrapper.cc
index 1781677..eadecfb 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper.cc
+++ b/chrome/browser/ui/autofill/data_model_wrapper.cc
@@ -14,9 +14,9 @@
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/form_structure.h"
 #include "components/autofill/browser/validation.h"
-#include "components/autofill/browser/wallet/full_wallet.h"
-#include "components/autofill/browser/wallet/wallet_address.h"
-#include "components/autofill/browser/wallet/wallet_items.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 "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 c81d80f..8339f6a 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper.h
+++ b/chrome/browser/ui/autofill/data_model_wrapper.h
@@ -9,7 +9,7 @@
 #include "base/string16.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "components/autofill/browser/field_types.h"
-#include "components/autofill/browser/wallet/wallet_items.h"
+#include "components/autofill/content/browser/wallet/wallet_items.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 70a03c2..144a6c9f8 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
+++ b/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
@@ -10,8 +10,8 @@
 #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/wallet/wallet_items.h"
-#include "components/autofill/browser/wallet/wallet_test_util.h"
+#include "components/autofill/content/browser/wallet/wallet_items.h"
+#include "components/autofill/content/browser/wallet/wallet_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm
index e1d885d..3bf043a 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm
@@ -9,7 +9,7 @@
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
-#include "components/autofill/browser/wallet/wallet_service_url.h"
+#include "components/autofill/content/browser/wallet/wallet_service_url.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
index 3f9a3c5..2a8055e 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -13,7 +13,7 @@
 #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/browser/wallet/wallet_service_url.h"
+#include "components/autofill/content/browser/wallet/wallet_service_url.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/chrome_tests.gypi b/chrome/chrome_tests.gypi
index dacba45..c4ce74a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1145,7 +1145,7 @@
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../components/components.gyp:autofill_content_risk_proto',
-        '../components/components.gyp:autofill_test_util',
+        '../components/components.gyp:autofill_content_test_util',
         '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 343435d..a9c42b3 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -412,7 +412,6 @@
         '<@(chromium_child_dependencies)',
         # 2) test-specific support libraries:
         '../base/base.gyp:test_support_base',
-        '../components/components.gyp:autofill_test_util',
         '../media/media.gyp:media_test_support',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
@@ -1775,14 +1774,14 @@
         '../components/autofill/browser/phone_number_unittest.cc',
         '../components/autofill/browser/phone_number_i18n_unittest.cc',
         '../components/autofill/browser/validation_unittest.cc',
-        '../components/autofill/browser/wallet/encryption_escrow_client_unittest.cc',
-        '../components/autofill/browser/wallet/full_wallet_unittest.cc',
-        '../components/autofill/browser/wallet/instrument_unittest.cc',
-        '../components/autofill/browser/wallet/wallet_address_unittest.cc',
-        '../components/autofill/browser/wallet/wallet_client_unittest.cc',
-        '../components/autofill/browser/wallet/wallet_items_unittest.cc',
-        '../components/autofill/browser/wallet/wallet_service_url_unittest.cc',
-        '../components/autofill/browser/wallet/wallet_signin_helper_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',
+        '../components/autofill/content/browser/wallet/wallet_address_unittest.cc',
+        '../components/autofill/content/browser/wallet/wallet_client_unittest.cc',
+        '../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',
 
         # TODO(caitkp): Move to //components/components.gypi once
         # remaining dependencies back to //chrome are eliminated.
@@ -1854,6 +1853,7 @@
         ['OS!="ios"', {
           'dependencies': [
             'common/extensions/api/api.gyp:api',
+            '../components/components.gyp:autofill_content_test_util',
             '../components/component_resources.gyp:component_resources',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
             '../gpu/gpu.gyp:gpu_unittest_utils',
diff --git a/components/autofill.gypi b/components/autofill.gypi
index 639c5d2..b677b19 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -22,15 +22,6 @@
                    'autofill/browser/autofill_regex_constants.cc.utf8'],
       }],
     },
-    {
-      'target_name': 'autofill_test_util',
-      'type': 'static_library',
-      'sources': [
-        'autofill/browser/wallet/wallet_test_util.cc',
-        'autofill/browser/wallet/wallet_test_util.h',
-      ],
-      'include_dirs': [ '..' ],
-    },
   ],
   'conditions': [
     ['OS != "ios"', {
@@ -211,26 +202,6 @@
             'autofill/browser/state_names.h',
             'autofill/browser/validation.cc',
             'autofill/browser/validation.h',
-            'autofill/browser/wallet/encryption_escrow_client.cc',
-            'autofill/browser/wallet/encryption_escrow_client.h',
-            'autofill/browser/wallet/encryption_escrow_client_observer.h',
-            'autofill/browser/wallet/full_wallet.cc',
-            'autofill/browser/wallet/full_wallet.h',
-            'autofill/browser/wallet/instrument.cc',
-            'autofill/browser/wallet/instrument.h',
-            'autofill/browser/wallet/required_action.cc',
-            'autofill/browser/wallet/required_action.h',
-            'autofill/browser/wallet/wallet_address.cc',
-            'autofill/browser/wallet/wallet_address.h',
-            'autofill/browser/wallet/wallet_client.cc',
-            'autofill/browser/wallet/wallet_client.h',
-            'autofill/browser/wallet/wallet_client_delegate.h',
-            'autofill/browser/wallet/wallet_items.cc',
-            'autofill/browser/wallet/wallet_items.h',
-            'autofill/browser/wallet/wallet_service_url.cc',
-            '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',
@@ -266,7 +237,16 @@
           },
           'includes': [ '../build/protoc.gypi' ]
         },
-        {
+       {
+         'target_name': 'autofill_content_test_util',
+         'type': 'static_library',
+         'sources': [
+           'autofill/content/browser/wallet/wallet_test_util.cc',
+           'autofill/content/browser/wallet/wallet_test_util.h',
+         ],
+         'include_dirs': [ '..' ],
+       },
+       {
           'target_name': 'autofill_content_browser',
           'type': 'static_library',
           'include_dirs': [
@@ -302,6 +282,26 @@
           'sources': [
             'autofill/content/browser/risk/fingerprint.cc',
             'autofill/content/browser/risk/fingerprint.h',
+            'autofill/content/browser/wallet/encryption_escrow_client.cc',
+            'autofill/content/browser/wallet/encryption_escrow_client.h',
+            'autofill/content/browser/wallet/encryption_escrow_client_observer.h',
+            'autofill/content/browser/wallet/full_wallet.cc',
+            'autofill/content/browser/wallet/full_wallet.h',
+            'autofill/content/browser/wallet/instrument.cc',
+            'autofill/content/browser/wallet/instrument.h',
+            'autofill/content/browser/wallet/required_action.cc',
+            'autofill/content/browser/wallet/required_action.h',
+            'autofill/content/browser/wallet/wallet_address.cc',
+            'autofill/content/browser/wallet/wallet_address.h',
+            'autofill/content/browser/wallet/wallet_client.cc',
+            'autofill/content/browser/wallet/wallet_client.h',
+            'autofill/content/browser/wallet/wallet_client_delegate.h',
+            'autofill/content/browser/wallet/wallet_items.cc',
+            'autofill/content/browser/wallet/wallet_items.h',
+            'autofill/content/browser/wallet/wallet_service_url.cc',
+            'autofill/content/browser/wallet/wallet_service_url.h',
+            'autofill/content/browser/wallet/wallet_signin_helper.cc',
+            'autofill/content/browser/wallet/wallet_signin_helper.h',
           ],
 
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
diff --git a/components/autofill/browser/autocheckout_request_manager.h b/components/autofill/browser/autocheckout_request_manager.h
index 2f38789..6878d3c 100644
--- a/components/autofill/browser/autocheckout_request_manager.h
+++ b/components/autofill/browser/autocheckout_request_manager.h
@@ -7,9 +7,9 @@
 
 #include "base/supports_user_data.h"
 #include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/wallet/wallet_client.h"
-#include "components/autofill/browser/wallet/wallet_client_delegate.h"
 #include "components/autofill/common/autocheckout_status.h"
+#include "components/autofill/content/browser/wallet/wallet_client.h"
+#include "components/autofill/content/browser/wallet/wallet_client_delegate.h"
 #include "googleurl/src/gurl.h"
 
 namespace content {
diff --git a/components/autofill/browser/wallet/OWNERS b/components/autofill/content/browser/wallet/OWNERS
index cba869d..cba869d 100644
--- a/components/autofill/browser/wallet/OWNERS
+++ b/components/autofill/content/browser/wallet/OWNERS
diff --git a/components/autofill/browser/wallet/encryption_escrow_client.cc b/components/autofill/content/browser/wallet/encryption_escrow_client.cc
index f047242..c0adf08 100644
--- a/components/autofill/browser/wallet/encryption_escrow_client.cc
+++ b/components/autofill/content/browser/wallet/encryption_escrow_client.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/wallet/encryption_escrow_client.h"
+#include "components/autofill/content/browser/wallet/encryption_escrow_client.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -10,9 +10,9 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/browser/wallet/encryption_escrow_client_observer.h"
-#include "components/autofill/browser/wallet/instrument.h"
-#include "components/autofill/browser/wallet/wallet_service_url.h"
+#include "components/autofill/content/browser/wallet/encryption_escrow_client_observer.h"
+#include "components/autofill/content/browser/wallet/instrument.h"
+#include "components/autofill/content/browser/wallet/wallet_service_url.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/http/http_status_code.h"
diff --git a/components/autofill/browser/wallet/encryption_escrow_client.h b/components/autofill/content/browser/wallet/encryption_escrow_client.h
index 9af04f6a..456c972 100644
--- a/components/autofill/browser/wallet/encryption_escrow_client.h
+++ b/components/autofill/content/browser/wallet/encryption_escrow_client.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_WALLET_ENCRYPTION_ESCROW_CLIENT_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WALLET_ENCRYPTION_ESCROW_CLIENT_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_ENCRYPTION_ESCROW_CLIENT_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_ENCRYPTION_ESCROW_CLIENT_H_
 
 #include <string>
 #include <vector>
@@ -97,4 +97,4 @@ class EncryptionEscrowClient : public net::URLFetcherDelegate {
 }  // namespace wallet
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WALLET_ENCRYPTION_ESCROW_CLIENT_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_ENCRYPTION_ESCROW_CLIENT_H_
diff --git a/components/autofill/browser/wallet/encryption_escrow_client_observer.h b/components/autofill/content/browser/wallet/encryption_escrow_client_observer.h
index b0a0d02..d5ff17d 100644
--- a/components/autofill/browser/wallet/encryption_escrow_client_observer.h
+++ b/components/autofill/content/browser/wallet/encryption_escrow_client_observer.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_WALLET_ENCRYPTION_ESCROW_CLIENT_OBSERVER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WALLET_ENCRYPTION_ESCROW_CLIENT_OBSERVER_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_ENCRYPTION_ESCROW_CLIENT_OBSERVER_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_ENCRYPTION_ESCROW_CLIENT_OBSERVER_H_
 
 #include <string>
 
@@ -50,4 +50,4 @@ class EncryptionEscrowClientObserver {
 }  // namespace wallet
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WALLET_ENCRYPTION_ESCROW_CLIENT_OBSERVER_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_ENCRYPTION_ESCROW_CLIENT_OBSERVER_H_
diff --git a/components/autofill/browser/wallet/encryption_escrow_client_unittest.cc b/components/autofill/content/browser/wallet/encryption_escrow_client_unittest.cc
index d6486cf..f042541 100644
--- a/components/autofill/browser/wallet/encryption_escrow_client_unittest.cc
+++ b/components/autofill/content/browser/wallet/encryption_escrow_client_unittest.cc
@@ -4,10 +4,10 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/wallet/encryption_escrow_client.h"
-#include "components/autofill/browser/wallet/encryption_escrow_client_observer.h"
-#include "components/autofill/browser/wallet/instrument.h"
-#include "components/autofill/browser/wallet/wallet_test_util.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/instrument.h"
+#include "components/autofill/content/browser/wallet/wallet_test_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
diff --git a/components/autofill/browser/wallet/full_wallet.cc b/components/autofill/content/browser/wallet/full_wallet.cc
index 0b3938e..1605f22 100644
--- a/components/autofill/browser/wallet/full_wallet.cc
+++ b/components/autofill/content/browser/wallet/full_wallet.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/wallet/full_wallet.h"
+#include "components/autofill/content/browser/wallet/full_wallet.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/components/autofill/browser/wallet/full_wallet.h b/components/autofill/content/browser/wallet/full_wallet.h
index 5f03c23..708e52a 100644
--- a/components/autofill/browser/wallet/full_wallet.h
+++ b/components/autofill/content/browser/wallet/full_wallet.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_WALLET_FULL_WALLET_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WALLET_FULL_WALLET_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_FULL_WALLET_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_FULL_WALLET_H_
 
 #include <string>
 #include <vector>
@@ -11,8 +11,8 @@
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/autofill/browser/wallet/required_action.h"
-#include "components/autofill/browser/wallet/wallet_address.h"
+#include "components/autofill/content/browser/wallet/required_action.h"
+#include "components/autofill/content/browser/wallet/wallet_address.h"
 
 namespace base {
 class DictionaryValue;
@@ -127,4 +127,4 @@ class FullWallet {
 }  // namespace wallet
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WALLET_FULL_WALLET_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_FULL_WALLET_H_
diff --git a/components/autofill/browser/wallet/full_wallet_unittest.cc b/components/autofill/content/browser/wallet/full_wallet_unittest.cc
index 04b97a4..910032b 100644
--- a/components/autofill/browser/wallet/full_wallet_unittest.cc
+++ b/components/autofill/content/browser/wallet/full_wallet_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,9 +8,9 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/autofill/browser/wallet/full_wallet.h"
-#include "components/autofill/browser/wallet/required_action.h"
-#include "components/autofill/browser/wallet/wallet_test_util.h"
+#include "components/autofill/content/browser/wallet/full_wallet.h"
+#include "components/autofill/content/browser/wallet/required_action.h"
+#include "components/autofill/content/browser/wallet/wallet_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/components/autofill/browser/wallet/instrument.cc b/components/autofill/content/browser/wallet/instrument.cc
index 45e2b5b..6c94b60 100644
--- a/components/autofill/browser/wallet/instrument.cc
+++ b/components/autofill/content/browser/wallet/instrument.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/wallet/instrument.h"
+#include "components/autofill/content/browser/wallet/instrument.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ -13,7 +13,7 @@
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/validation.h"
-#include "components/autofill/browser/wallet/wallet_address.h"
+#include "components/autofill/content/browser/wallet/wallet_address.h"
 
 namespace autofill {
 namespace wallet {
diff --git a/components/autofill/browser/wallet/instrument.h b/components/autofill/content/browser/wallet/instrument.h
index 123b1cf..97ee2e8 100644
--- a/components/autofill/browser/wallet/instrument.h
+++ b/components/autofill/content/browser/wallet/instrument.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_WALLET_INSTRUMENT_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WALLET_INSTRUMENT_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_INSTRUMENT_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_INSTRUMENT_H_
 
 #include <string>
 #include "base/basictypes.h"
@@ -101,4 +101,4 @@ class Instrument {
 }  // namespace wallet
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WALLET_INSTRUMENT_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_INSTRUMENT_H_
diff --git a/components/autofill/browser/wallet/instrument_unittest.cc b/components/autofill/content/browser/wallet/instrument_unittest.cc
index 231b65e..f4b9ee8 100644
--- a/components/autofill/browser/wallet/instrument_unittest.cc
+++ b/components/autofill/content/browser/wallet/instrument_unittest.cc
@@ -1,12 +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 "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/autofill/browser/wallet/instrument.h"
-#include "components/autofill/browser/wallet/wallet_address.h"
-#include "components/autofill/browser/wallet/wallet_test_util.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_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/components/autofill/browser/wallet/required_action.cc b/components/autofill/content/browser/wallet/required_action.cc
index 149a750..716da3e 100644
--- a/components/autofill/browser/wallet/required_action.cc
+++ b/components/autofill/content/browser/wallet/required_action.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/wallet/required_action.h"
+#include "components/autofill/content/browser/wallet/required_action.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
diff --git a/components/autofill/browser/wallet/required_action.h b/components/autofill/content/browser/wallet/required_action.h
index d62efef..eb53622 100644
--- a/components/autofill/browser/wallet/required_action.h
+++ b/components/autofill/content/browser/wallet/required_action.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_WALLET_REQUIRED_ACTION_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WALLET_REQUIRED_ACTION_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_REQUIRED_ACTION_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_REQUIRED_ACTION_H_
 
 #include <string>
 
@@ -41,4 +41,4 @@ RequiredAction ParseRequiredActionFromString(const std::string& str);
 }  // namespace wallet
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WALLET_REQUIRED_ACTION_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_REQUIRED_ACTION_H_
diff --git a/components/autofill/browser/wallet/wallet_address.cc b/components/autofill/content/browser/wallet/wallet_address.cc
index 7b91183..afc27ef 100644
--- a/components/autofill/browser/wallet/wallet_address.cc
+++ b/components/autofill/content/browser/wallet/wallet_address.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/wallet/wallet_address.h"
+#include "components/autofill/content/browser/wallet/wallet_address.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
diff --git a/components/autofill/browser/wallet/wallet_address.h b/components/autofill/content/browser/wallet/wallet_address.h
index c9062a1..87a335e 100644
--- a/components/autofill/browser/wallet/wallet_address.h
+++ b/components/autofill/content/browser/wallet/wallet_address.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_WALLET_WALLET_ADDRESS_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_ADDRESS_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ADDRESS_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ADDRESS_H_
 
 #include <string>
 
@@ -197,4 +197,4 @@ class Address {
 }  // namespace wallet
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_ADDRESS_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ADDRESS_H_
diff --git a/components/autofill/browser/wallet/wallet_address_unittest.cc b/components/autofill/content/browser/wallet/wallet_address_unittest.cc
index d423872..924037c 100644
--- a/components/autofill/browser/wallet/wallet_address_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_address_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.
 
@@ -7,7 +7,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/autofill/browser/wallet/wallet_address.h"
+#include "components/autofill/content/browser/wallet/wallet_address.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/components/autofill/browser/wallet/wallet_client.cc b/components/autofill/content/browser/wallet/wallet_client.cc
index f8cd755..59e10c1 100644
--- a/components/autofill/browser/wallet/wallet_client.cc
+++ b/components/autofill/content/browser/wallet/wallet_client.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/wallet/wallet_client.h"
+#include "components/autofill/content/browser/wallet/wallet_client.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
@@ -11,11 +11,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/wallet/instrument.h"
-#include "components/autofill/browser/wallet/wallet_address.h"
-#include "components/autofill/browser/wallet/wallet_client_delegate.h"
-#include "components/autofill/browser/wallet/wallet_items.h"
-#include "components/autofill/browser/wallet/wallet_service_url.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 "crypto/random.h"
 #include "google_apis/google_api_keys.h"
 #include "net/http/http_status_code.h"
diff --git a/components/autofill/browser/wallet/wallet_client.h b/components/autofill/content/browser/wallet/wallet_client.h
index 5602136..13163b6 100644
--- a/components/autofill/browser/wallet/wallet_client.h
+++ b/components/autofill/content/browser/wallet/wallet_client.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_WALLET_WALLET_CLIENT_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_CLIENT_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_CLIENT_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_CLIENT_H_
 
 #include <queue>
 #include <string>
@@ -15,11 +15,11 @@
 #include "base/values.h"
 #include "components/autofill/browser/autofill_manager_delegate.h"
 #include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/wallet/encryption_escrow_client.h"
-#include "components/autofill/browser/wallet/encryption_escrow_client_observer.h"
-#include "components/autofill/browser/wallet/full_wallet.h"
-#include "components/autofill/browser/wallet/wallet_items.h"
 #include "components/autofill/common/autocheckout_status.h"
+#include "components/autofill/content/browser/wallet/encryption_escrow_client.h"
+#include "components/autofill/content/browser/wallet/encryption_escrow_client_observer.h"
+#include "components/autofill/content/browser/wallet/full_wallet.h"
+#include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
@@ -320,4 +320,4 @@ class WalletClient
 }  // namespace wallet
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_CLIENT_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_CLIENT_H_
diff --git a/components/autofill/browser/wallet/wallet_client_delegate.h b/components/autofill/content/browser/wallet/wallet_client_delegate.h
index 2125e07..895a265 100644
--- a/components/autofill/browser/wallet/wallet_client_delegate.h
+++ b/components/autofill/content/browser/wallet/wallet_client_delegate.h
@@ -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.
 
@@ -9,7 +9,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "components/autofill/browser/autofill_manager_delegate.h"
-#include "components/autofill/browser/wallet/wallet_client.h"
+#include "components/autofill/content/browser/wallet/wallet_client.h"
 
 class AutofillMetrics;
 
diff --git a/components/autofill/browser/wallet/wallet_client_unittest.cc b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
index 825ea04..2ddc815 100644
--- a/components/autofill/browser/wallet/wallet_client_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_client_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.
 
@@ -11,13 +11,13 @@
 #include "base/values.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/browser/autofill_metrics.h"
-#include "components/autofill/browser/wallet/full_wallet.h"
-#include "components/autofill/browser/wallet/instrument.h"
-#include "components/autofill/browser/wallet/wallet_client.h"
-#include "components/autofill/browser/wallet/wallet_client_delegate.h"
-#include "components/autofill/browser/wallet/wallet_items.h"
-#include "components/autofill/browser/wallet/wallet_test_util.h"
 #include "components/autofill/common/autocheckout_status.h"
+#include "components/autofill/content/browser/wallet/full_wallet.h"
+#include "components/autofill/content/browser/wallet/instrument.h"
+#include "components/autofill/content/browser/wallet/wallet_client.h"
+#include "components/autofill/content/browser/wallet/wallet_client_delegate.h"
+#include "components/autofill/content/browser/wallet/wallet_items.h"
+#include "components/autofill/content/browser/wallet/wallet_test_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
diff --git a/components/autofill/browser/wallet/wallet_items.cc b/components/autofill/content/browser/wallet/wallet_items.cc
index 89024ad..3f4ff77 100644
--- a/components/autofill/browser/wallet/wallet_items.cc
+++ b/components/autofill/content/browser/wallet/wallet_items.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/wallet/wallet_items.h"
+#include "components/autofill/content/browser/wallet/wallet_items.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/components/autofill/browser/wallet/wallet_items.h b/components/autofill/content/browser/wallet/wallet_items.h
index 19b90ef..08d0d1d 100644
--- a/components/autofill/browser/wallet/wallet_items.h
+++ b/components/autofill/content/browser/wallet/wallet_items.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_WALLET_WALLET_ITEMS_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_ITEMS_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ITEMS_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ITEMS_H_
 
 #include <string>
 #include <vector>
@@ -14,8 +14,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
-#include "components/autofill/browser/wallet/required_action.h"
-#include "components/autofill/browser/wallet/wallet_address.h"
+#include "components/autofill/content/browser/wallet/required_action.h"
+#include "components/autofill/content/browser/wallet/wallet_address.h"
 #include "googleurl/src/gurl.h"
 
 namespace base {
@@ -295,4 +295,4 @@ class WalletItems {
 }  // namespace wallet
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_ITEMS_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ITEMS_H_
diff --git a/components/autofill/browser/wallet/wallet_items_unittest.cc b/components/autofill/content/browser/wallet/wallet_items_unittest.cc
index bb08914..7bdf9d0 100644
--- a/components/autofill/browser/wallet/wallet_items_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_items_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.
 
@@ -7,8 +7,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/autofill/browser/wallet/required_action.h"
-#include "components/autofill/browser/wallet/wallet_items.h"
+#include "components/autofill/content/browser/wallet/required_action.h"
+#include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/autofill/browser/wallet/wallet_service_url.cc b/components/autofill/content/browser/wallet/wallet_service_url.cc
index 9317023..aa5cf99 100644
--- a/components/autofill/browser/wallet/wallet_service_url.cc
+++ b/components/autofill/content/browser/wallet/wallet_service_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/wallet/wallet_service_url.h"
+#include "components/autofill/content/browser/wallet/wallet_service_url.h"
 
 #include <string>
 
diff --git a/components/autofill/browser/wallet/wallet_service_url.h b/components/autofill/content/browser/wallet/wallet_service_url.h
index fd4e2e4..a9a32fb 100644
--- a/components/autofill/browser/wallet/wallet_service_url.h
+++ b/components/autofill/content/browser/wallet/wallet_service_url.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_WALLET_WALLET_SERVICE_URL_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_SERVICE_URL_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_SERVICE_URL_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_SERVICE_URL_H_
 
 class GURL;
 
@@ -40,4 +40,4 @@ bool IsUsingProd();
 }  // namespace wallet
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_SERVICE_URL_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_SERVICE_URL_H_
diff --git a/components/autofill/browser/wallet/wallet_service_url_unittest.cc b/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc
index a0dc099..ec18062 100644
--- a/components/autofill/browser/wallet/wallet_service_url_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_service_url_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/command_line.h"
-#include "components/autofill/browser/wallet/wallet_service_url.h"
 #include "components/autofill/common/autofill_switches.h"
+#include "components/autofill/content/browser/wallet/wallet_service_url.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/autofill/browser/wallet/wallet_signin_helper.cc b/components/autofill/content/browser/wallet/wallet_signin_helper.cc
index d4694a2..a78011a 100644
--- a/components/autofill/browser/wallet/wallet_signin_helper.cc
+++ b/components/autofill/content/browser/wallet/wallet_signin_helper.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/wallet/wallet_signin_helper.h"
+#include "components/autofill/content/browser/wallet/wallet_signin_helper.h"
 
 #include "base/callback_helpers.h"
 #include "base/json/json_reader.h"
@@ -11,8 +11,8 @@
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/values.h"
-#include "components/autofill/browser/wallet/wallet_service_url.h"
-#include "components/autofill/browser/wallet/wallet_signin_helper_delegate.h"
+#include "components/autofill/content/browser/wallet/wallet_service_url.h"
+#include "components/autofill/content/browser/wallet/wallet_signin_helper_delegate.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
diff --git a/components/autofill/browser/wallet/wallet_signin_helper.h b/components/autofill/content/browser/wallet/wallet_signin_helper.h
index dffbd75..4733dc9 100644
--- a/components/autofill/browser/wallet/wallet_signin_helper.h
+++ b/components/autofill/content/browser/wallet/wallet_signin_helper.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_WALLET_WALLET_SIGNIN_HELPER_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_SIGNIN_HELPER_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_SIGNIN_HELPER_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_SIGNIN_HELPER_H_
 
 #include <string>
 
@@ -143,4 +143,4 @@ class WalletSigninHelper : public GaiaAuthConsumer,
 }  // namespace wallet
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_SIGNIN_HELPER_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_SIGNIN_HELPER_H_
diff --git a/components/autofill/browser/wallet/wallet_signin_helper_delegate.h b/components/autofill/content/browser/wallet/wallet_signin_helper_delegate.h
index 47c5b66d..47c5b66d 100644
--- a/components/autofill/browser/wallet/wallet_signin_helper_delegate.h
+++ b/components/autofill/content/browser/wallet/wallet_signin_helper_delegate.h
diff --git a/components/autofill/browser/wallet/wallet_signin_helper_unittest.cc b/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc
index 20175b1..ea4b444f 100644
--- a/components/autofill/browser/wallet/wallet_signin_helper_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/wallet/wallet_signin_helper.h"
+#include "components/autofill/content/browser/wallet/wallet_signin_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/stringprintf.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/autofill/browser/wallet/wallet_service_url.h"
-#include "components/autofill/browser/wallet/wallet_signin_helper_delegate.h"
+#include "components/autofill/content/browser/wallet/wallet_service_url.h"
+#include "components/autofill/content/browser/wallet/wallet_signin_helper_delegate.h"
 #include "content/public/test/test_browser_thread.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
diff --git a/components/autofill/browser/wallet/wallet_test_util.cc b/components/autofill/content/browser/wallet/wallet_test_util.cc
index be5da10..8b5cf8f 100644
--- a/components/autofill/browser/wallet/wallet_test_util.cc
+++ b/components/autofill/content/browser/wallet/wallet_test_util.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/wallet/wallet_test_util.h"
+#include "components/autofill/content/browser/wallet/wallet_test_util.h"
 
 #include <string>
 #include <vector>
@@ -11,10 +11,10 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "base/values.h"
-#include "components/autofill/browser/wallet/full_wallet.h"
-#include "components/autofill/browser/wallet/instrument.h"
-#include "components/autofill/browser/wallet/required_action.h"
-#include "components/autofill/browser/wallet/wallet_address.h"
+#include "components/autofill/content/browser/wallet/full_wallet.h"
+#include "components/autofill/content/browser/wallet/instrument.h"
+#include "components/autofill/content/browser/wallet/required_action.h"
+#include "components/autofill/content/browser/wallet/wallet_address.h"
 
 namespace autofill {
 namespace wallet {
diff --git a/components/autofill/browser/wallet/wallet_test_util.h b/components/autofill/content/browser/wallet/wallet_test_util.h
index 306b07f..e4978a6 100644
--- a/components/autofill/browser/wallet/wallet_test_util.h
+++ b/components/autofill/content/browser/wallet/wallet_test_util.h
@@ -1,12 +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.
 
-#ifndef COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_TEST_UTIL_H_
-#define COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_TEST_UTIL_H_
+#ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_TEST_UTIL_H_
+#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_TEST_UTIL_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "components/autofill/browser/wallet/wallet_items.h"
+#include "components/autofill/content/browser/wallet/wallet_items.h"
 
 namespace autofill {
 namespace wallet {
@@ -36,4 +36,4 @@ scoped_ptr<WalletItems> GetTestWalletItems();
 }  // namespace wallet
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_BROWSER_WALLET_WALLET_TEST_UTIL_H_
+#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_TEST_UTIL_H_