Show user data dialog earlier on Windows.

chrome/browser/ui/views/user_data_dir_dialog_view.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/views/user_data_dir_dialog_view.h"
 
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/user_data_dir_dialog.h"
@@ skipping 85 matching lines @@
                                          void* params) {
   user_data_dir_ = path;
   is_blocking_ = false;
 }
 
 void UserDataDirDialogView::FileSelectionCanceled(void* params) {
 }
 
 namespace chrome {
 
+base::Closure g_custom_callback_for_test;

[sky, 2013/03/22 23:14:27]

Constants like this can not be objects.

[hshi1, 2013/03/22 23:51:04]

Done. (Made it a pointer, and moved to extractor_win.cc).

+void InstallCustomShowUserDataDirDialogCallbackForTest(
+    const base::Closure& callback) {
+  g_custom_callback_for_test = callback;
+}
+
 base::FilePath ShowUserDataDirDialog(const base::FilePath& user_data_dir) {
+  if (!g_custom_callback_for_test.is_null()) {
+    g_custom_callback_for_test().Run();
+    return base::FilePath();
+  }
   DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
   // When the window closes, it will delete itself.
   UserDataDirDialogView* dialog = new UserDataDirDialogView(user_data_dir);
   views::Widget::CreateWindow(dialog)->Show();
   base::RunLoop run_loop(dialog);
   run_loop.Run();
   return dialog->user_data_dir();
 }
 
 }  // namespace chrome