Revise user-data-dir switch handling; avoid crashes.

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 2563 matching lines @@
         'browser/usb/usb_device_handle.cc',
         'browser/usb/usb_device_handle.h',
         'browser/usb/usb_interface.cc',
         'browser/usb/usb_interface.h',
         'browser/usb/usb_context.cc',
         'browser/usb/usb_context.h',
         'browser/usb/usb_service.cc',
         'browser/usb/usb_service.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/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.cc',
         'browser/value_store/value_store.h',
         'browser/value_store/value_store_change.cc',
         'browser/value_store/value_store_change.h',
         'browser/value_store/value_store_frontend.cc',
         'browser/value_store/value_store_frontend.h',
@@ skipping 834 matching lines @@
             '../win8/win8.gyp:win8_util',
           ],
           'export_dependent_settings': [
             '../ui/views/controls/webview/webview.gyp:webview',
             '../ui/views/views.gyp:views',
           ],
           'sources!': [
             'browser/first_run/first_run_dialog.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 322 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' ],
         },
       ],
      },
     ],
   ],
 }