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

This change is part of moving components/autofill into its eventual structure
as a layered component. This CL additionally creates the
autofill_content_browser target and renames the autofill_risk_proto target to autofill_content_risk_proto. 

TBR=joi, darin, benm
BUG=247015

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

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

1 files changed, 58 insertions, 16 deletions

diff --git a/components/autofill.gypi b/components/autofill.gypi
index 80b5af9..639c5d2 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -23,19 +23,6 @@
       }],
     },
     {
-      # Protobuf compiler / generate rule for Autofill's risk integration.
-      'target_name': 'autofill_risk_proto',
-      'type': 'static_library',
-      'sources': [
-        'autofill/browser/risk/proto/fingerprint.proto',
-      ],
-      'variables': {
-        'proto_in_dir': 'autofill/browser/risk/proto',
-        'proto_out_dir': 'components/autofill/browser/risk/proto',
-      },
-      'includes': [ '../build/protoc.gypi' ]
-    },
-    {
       'target_name': 'autofill_test_util',
       'type': 'static_library',
       'sources': [
@@ -106,6 +93,9 @@
         },
 
         {
+          # TODO(blundell): Eliminate this target; instead, have only the
+          # autofill_content_browser target and a new top-level
+          # autofill_shared target. crbug.com/247015
           'target_name': 'autofill_browser',
           'type': 'static_library',
           'include_dirs': [
@@ -114,7 +104,6 @@
           'dependencies': [
             'autofill_common',
             'autofill_regexes',
-            'autofill_risk_proto',
             'encryptor',
             'user_prefs',
             'webdata_common',
@@ -218,8 +207,6 @@
             'autofill/browser/phone_number.h',
             'autofill/browser/phone_number_i18n.cc',
             'autofill/browser/phone_number_i18n.h',
-            'autofill/browser/risk/fingerprint.cc',
-            'autofill/browser/risk/fingerprint.h',
             'autofill/browser/state_names.cc',
             'autofill/browser/state_names.h',
             'autofill/browser/validation.cc',
@@ -267,6 +254,61 @@
         },
 
         {
+          # Protobuf compiler / generate rule for Autofill's risk integration.
+          'target_name': 'autofill_content_risk_proto',
+          'type': 'static_library',
+          'sources': [
+            'autofill/content/browser/risk/proto/fingerprint.proto',
+          ],
+          'variables': {
+            'proto_in_dir': 'autofill/content/browser/risk/proto',
+            'proto_out_dir': 'components/autofill/content/browser/risk/proto',
+          },
+          'includes': [ '../build/protoc.gypi' ]
+        },
+        {
+          'target_name': 'autofill_content_browser',
+          'type': 'static_library',
+          'include_dirs': [
+            '..',
+          ],
+          'dependencies': [
+            'autofill_browser',
+            'autofill_common',
+            'autofill_content_risk_proto',
+            'autofill_regexes',
+            'encryptor',
+            'user_prefs',
+            'webdata_common',
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
+            '../base/base.gyp:base_prefs',
+            '../content/content.gyp:content_browser',
+            '../content/content.gyp:content_common',
+            '../google_apis/google_apis.gyp:google_apis',
+            '../ipc/ipc.gyp:ipc',
+            '../skia/skia.gyp:skia',
+            '../sql/sql.gyp:sql',
+            '../third_party/icu/icu.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icuuc',
+            '../third_party/libjingle/libjingle.gyp:libjingle',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
+            '../ui/ui.gyp:ui',
+            '../url/url.gyp:url_lib',
+            '../webkit/support/webkit_support.gyp:webkit_resources',
+
+            'component_resources.gyp:component_resources',
+          ],
+          'sources': [
+            'autofill/content/browser/risk/fingerprint.cc',
+            'autofill/content/browser/risk/fingerprint.h',
+          ],
+
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [4267, ],
+        },
+
+        {
           'target_name': 'autofill_content_renderer',
           'type': 'static_library',
           'include_dirs': [