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

chrome/browser/user_data_dir_extractor_browsertest.cc

Index: chrome/browser/user_data_dir_extractor_browsertest.cc
diff --git a/chrome/browser/user_data_dir_extractor_win_browsertest.cc b/chrome/browser/user_data_dir_extractor_browsertest.cc
similarity index 93%
rename from chrome/browser/user_data_dir_extractor_win_browsertest.cc
rename to chrome/browser/user_data_dir_extractor_browsertest.cc
index 0adc7653a11010fb4941cae153202d692c0d2cc8..3182991a8f641d8dafb2e6447c090b51fbed5df8 100644
--- a/chrome/browser/user_data_dir_extractor_win_browsertest.cc
+++ b/chrome/browser/user_data_dir_extractor_browsertest.cc
@@ -2,22 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/ui/ui_test.h"
-
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
-#include "chrome/browser/user_data_dir_extractor_win.h"
+#include "chrome/browser/user_data_dir_extractor.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "chrome/test/ui/ui_test.h"
 
-// These tests only apply to the Windows version; see chrome_browser_main.cc:
-// function GetUserDataDir() for details.
 class ChromeMainUserDataDirTest : public InProcessBrowserTest {
  public:
   ChromeMainUserDataDirTest()