Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(417)

Side by Side Diff: chrome/browser/unload_uitest.cc

Issue 114063: Disable the failing UI test. I filed a P1 bug on it. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "app/message_box_flags.h" 5 #include "app/message_box_flags.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/platform_thread.h" 7 #include "base/platform_thread.h"
8 #include "chrome/browser/automation/url_request_mock_http_job.h" 8 #include "chrome/browser/automation/url_request_mock_http_job.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/test/automation/browser_proxy.h" 10 #include "chrome/test/automation/browser_proxy.h"
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 LoadUrlAndQuitBrowser(TWO_SECOND_UNLOAD_ALERT_HTML, L"twosecondunloadalert"); 320 LoadUrlAndQuitBrowser(TWO_SECOND_UNLOAD_ALERT_HTML, L"twosecondunloadalert");
321 } 321 }
322 322
323 // Tests closing the browser with a beforeunload handler that takes 323 // Tests closing the browser with a beforeunload handler that takes
324 // two seconds to run then pops up an alert. 324 // two seconds to run then pops up an alert.
325 TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnloadAlert) { 325 TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnloadAlert) {
326 LoadUrlAndQuitBrowser(TWO_SECOND_BEFORE_UNLOAD_ALERT_HTML, 326 LoadUrlAndQuitBrowser(TWO_SECOND_BEFORE_UNLOAD_ALERT_HTML,
327 L"twosecondbeforeunloadalert"); 327 L"twosecondbeforeunloadalert");
328 } 328 }
329 329
330 // TODO(brettw) bug 12913 this test was broken by WebKit merge 42202:44252.
331 // Apparently popup titles are broken somehow.
332 #if 0
333
330 // Tests that if there's a renderer process with two tabs, one of which has an 334 // Tests that if there's a renderer process with two tabs, one of which has an
331 // unload handler, and the other doesn't, the tab that doesn't have an unload 335 // unload handler, and the other doesn't, the tab that doesn't have an unload
332 // handler can be closed. If this test fails, the Close() call will hang. 336 // handler can be closed. If this test fails, the Close() call will hang.
333 TEST_F(UnloadTest, BrowserCloseTabWhenOtherTabHasListener) { 337 TEST_F(UnloadTest, BrowserCloseTabWhenOtherTabHasListener) {
334 NavigateToDataURL(CLOSE_TAB_WHEN_OTHER_TAB_HAS_LISTENER, L"only_one_unload"); 338 NavigateToDataURL(CLOSE_TAB_WHEN_OTHER_TAB_HAS_LISTENER, L"only_one_unload");
335 int window_count; 339 int window_count;
336 automation()->GetBrowserWindowCount(&window_count); 340 automation()->GetBrowserWindowCount(&window_count);
337 ASSERT_EQ(2, window_count); 341 ASSERT_EQ(2, window_count);
338 342
339 scoped_ptr<BrowserProxy> popup_browser_proxy( 343 scoped_ptr<BrowserProxy> popup_browser_proxy(
(...skipping 15 matching lines...) Expand all
355 int main_tab_count; 359 int main_tab_count;
356 EXPECT_TRUE(main_browser_proxy->GetTabCount(&main_tab_count)); 360 EXPECT_TRUE(main_browser_proxy->GetTabCount(&main_tab_count));
357 EXPECT_EQ(1, main_tab_count); 361 EXPECT_EQ(1, main_tab_count);
358 scoped_ptr<TabProxy> main_tab(main_browser_proxy->GetActiveTab()); 362 scoped_ptr<TabProxy> main_tab(main_browser_proxy->GetActiveTab());
359 std::wstring main_title; 363 std::wstring main_title;
360 ASSERT_TRUE(main_tab.get() != NULL); 364 ASSERT_TRUE(main_tab.get() != NULL);
361 EXPECT_TRUE(main_tab->GetTabTitle(&main_title)); 365 EXPECT_TRUE(main_tab->GetTabTitle(&main_title));
362 EXPECT_EQ(std::wstring(L"only_one_unload"), main_title); 366 EXPECT_EQ(std::wstring(L"only_one_unload"), main_title);
363 } 367 }
364 368
369 #endif
370
365 // TODO(ojan): Add tests for unload/beforeunload that have multiple tabs 371 // TODO(ojan): Add tests for unload/beforeunload that have multiple tabs
366 // and multiple windows. 372 // and multiple windows.
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698