Merge 190833 "Show user data dialog earlier on Windows."

chrome/chrome_browser.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': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 2041 matching lines @@
         'browser/upgrade_detector.cc',
         'browser/upgrade_detector.h',
         'browser/upgrade_detector_impl.cc',
         'browser/upgrade_detector_impl.h',
         'browser/usb/usb_device.cc',
         'browser/usb/usb_device.h',
         'browser/usb/usb_service.cc',
         'browser/usb/usb_service.h',
         'browser/usb/usb_service_factory.cc',
         'browser/usb/usb_service_factory.h',
+        'browser/user_data_dir_extractor.cc',
+        'browser/user_data_dir_extractor.h',
+        'browser/user_data_dir_extractor_win.cc',
+        'browser/user_data_dir_extractor_win.h',
         'browser/user_style_sheet_watcher.cc',
         'browser/user_style_sheet_watcher.h',
         'browser/user_style_sheet_watcher_factory.cc',
         'browser/user_style_sheet_watcher_factory.h',
         'browser/value_store/leveldb_value_store.cc',
         'browser/value_store/leveldb_value_store.h',
         'browser/value_store/testing_value_store.cc',
         'browser/value_store/testing_value_store.h',
         'browser/value_store/value_store_change.cc',
         'browser/value_store/value_store_change.h',
@@ skipping 771 matching lines @@
           'sources': [
             # Using built-in rule in vstudio for midl.
             'browser/history/history_indexer.idl',
           ],
           'sources!': [
             'browser/history/history_publisher_none.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/lifetime/application_lifetime_stub.cc',
             'browser/profiles/profile_shortcut_manager_stub.cc',
+            'browser/user_data_dir_extractor.cc',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '<(allocator_target)',
               ],
             }],
           ],
         }, {  # 'OS!="win"
           'sources/': [
@@ skipping 257 matching lines @@
             'package_name': 'org/chromium/chrome/browser/ui/toolbar',
             'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }