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

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"

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"
 

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"

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"

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"

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"
 

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;

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 {

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"
 

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"

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',

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',

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.

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 {

components/autofill/browser/wallet/encryption_escrow_client.cc → components/autofill/content/browser/wallet/encryption_escrow_client.cc

@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/browser/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"
 #include "base/stringprintf.h"
 #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"

components/autofill/browser/wallet/encryption_escrow_client.h → 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_

components/autofill/browser/wallet/encryption_escrow_client_observer.h → 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_

components/autofill/browser/wallet/encryption_escrow_client_unittest.cc → 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"

components/autofill/browser/wallet/full_wallet.cc → 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"

components/autofill/browser/wallet/full_wallet.h → components/autofill/content/browser/wallet/full_wallet.h

@@ -1,18 +1,18 @@
-// 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>
 
 #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_