Fix showModalDialog regression.

chrome/browser/browser_uitest.cc

 // Copyright (c) 2006-2008 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 "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/platform_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 #include "grit/chromium_strings.h"
@@ skipping 295 matching lines @@
       // Success, bail out.
       break;
     }
   }
 
   if (i == 10)
     FAIL() << "failed to get error page title";
 }
 #endif
 
+#if defined(OS_WIN)  // only works on Windows for now: http:://crbug.com/15891
+class ShowModalDialogTest : public UITest {
+ public:
+  ShowModalDialogTest() {
+    launch_arguments_.AppendSwitch(switches::kDisablePopupBlocking);
+  }
+};
+
+TEST_F(ShowModalDialogTest, BasicTest) {
+  FilePath test_file(test_data_directory_);
+  test_file = test_file.AppendASCII("showmodaldialog.html");
+  NavigateToURL(net::FilePathToFileURL(test_file));
+
+  ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, action_timeout_ms()));
+
+  scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(1);
+  scoped_refptr<TabProxy> tab = browser->GetActiveTab();
+
+  std::wstring title;
+  ASSERT_TRUE(tab->GetTabTitle(&title));
+  ASSERT_EQ(title, L"ModalDialogTitle");
+}
+#endif
+
 }  // namespace