[Smart Lock, Prefs reconciliation] Prefs migration logic for desktop platforms.

chrome/chrome_tests.gypi

 # 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.
 {
   'variables': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 1404 matching lines @@
       'browser/sync/test/integration/sync_errors_test.cc',
       'browser/sync/test/integration/sync_exponential_backoff_test.cc',
       'browser/sync/test/integration/two_client_app_list_sync_test.cc',
       'browser/sync/test/integration/two_client_apps_sync_test.cc',
       'browser/sync/test/integration/two_client_autofill_sync_test.cc',
       'browser/sync/test/integration/two_client_bookmarks_sync_test.cc',
       'browser/sync/test/integration/two_client_dictionary_sync_test.cc',
       'browser/sync/test/integration/two_client_e2e_test.cc',
       'browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc',
       'browser/sync/test/integration/two_client_extensions_sync_test.cc',
+      'browser/sync/test/integration/two_client_password_manager_setting_migrater_service_sync_test.cc',
       'browser/sync/test/integration/two_client_passwords_sync_test.cc',
       'browser/sync/test/integration/two_client_preferences_sync_test.cc',
       'browser/sync/test/integration/two_client_search_engines_sync_test.cc',
       'browser/sync/test/integration/two_client_sessions_sync_test.cc',
       'browser/sync/test/integration/two_client_themes_sync_test.cc',
       'browser/sync/test/integration/two_client_typed_urls_sync_test.cc',
       'browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc',
       'test/base/browser_tests_main.cc',
       'test/data/resource.rc',
     ],
@@ skipping 1941 matching lines @@
             'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }