Move more webdata unittests into components_unittests target.

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 1976 matching lines @@
         '../components/autofill/core/browser/form_structure_unittest.cc',
         '../components/autofill/core/browser/name_field_unittest.cc',
         '../components/autofill/core/browser/password_autofill_manager_unittest.cc',
         '../components/autofill/core/browser/password_generator_unittest.cc',
         '../components/autofill/core/browser/personal_data_manager_unittest.cc',
         '../components/autofill/core/browser/phone_field_unittest.cc',
         '../components/autofill/core/browser/phone_number_unittest.cc',
         '../components/autofill/core/browser/phone_number_i18n_unittest.cc',
         '../components/autofill/core/browser/validation_unittest.cc',
 
-        # TODO(caitkp): Move to //components/components_tests.gypi once
-        # remaining dependencies back to //chrome are eliminated.
-        '../components/autofill/core/browser/webdata/autofill_table_unittest.cc',
-        '../components/autofill/core/browser/webdata/web_data_service_unittest.cc',
-
         # TODO(yael): Move to //components/components_tests.gypi once
         # nacl_defines is moved out of chrome.gyp into a common place.
         '../components/nacl/loader/nacl_ipc_adapter_unittest.cc',
         '../components/nacl/loader/nacl_validation_query_unittest.cc',
 
         '../components/webdata/common/web_database_migration_unittest.cc',
         '../components/webdata/common/web_data_service_test_util.cc',
         '../components/webdata/common/web_data_service_test_util.h',
         '../components/webdata/encryptor/ie7_password_unittest_win.cc',
 
@@ skipping 914 matching lines @@
             'browser/ui/app_list/test/fake_profile_store.cc',
             'browser/ui/app_list/test/fake_profile_store.h',
             'browser/ui/app_list/test/fast_show_pickler_unittest.cc',
             'browser/ui/views/app_list/win/app_list_win_unittest.cc',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }