| OLD | NEW |
| 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/net/url_request_mock_http_job.h" | 8 #include "chrome/browser/net/url_request_mock_http_job.h" |
| 9 #include "chrome/browser/view_ids.h" | 9 #include "chrome/browser/view_ids.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 L"twosecondbeforeunloadalert"); | 400 L"twosecondbeforeunloadalert"); |
| 401 } | 401 } |
| 402 | 402 |
| 403 #if defined(OS_MACOSX) | 403 #if defined(OS_MACOSX) |
| 404 // http://crbug.com/45162 | 404 // http://crbug.com/45162 |
| 405 #define MAYBE_BrowserCloseTabWhenOtherTabHasListener \ | 405 #define MAYBE_BrowserCloseTabWhenOtherTabHasListener \ |
| 406 DISABLED_BrowserCloseTabWhenOtherTabHasListener | 406 DISABLED_BrowserCloseTabWhenOtherTabHasListener |
| 407 #elif defined(OS_WIN) | 407 #elif defined(OS_WIN) |
| 408 // http://crbug.com/45281 | 408 // http://crbug.com/45281 |
| 409 #define MAYBE_BrowserCloseTabWhenOtherTabHasListener \ | 409 #define MAYBE_BrowserCloseTabWhenOtherTabHasListener \ |
| 410 DISABLED_BrowserCloseTabWhenOtherTabHasListener | 410 FAILS_BrowserCloseTabWhenOtherTabHasListener |
| 411 #else | 411 #else |
| 412 // Flaky on Linux as well. http://crbug.com/45562 | 412 // Flaky on Linux as well. http://crbug.com/45562 |
| 413 #define MAYBE_BrowserCloseTabWhenOtherTabHasListener \ | 413 #define MAYBE_BrowserCloseTabWhenOtherTabHasListener \ |
| 414 FLAKY_BrowserCloseTabWhenOtherTabHasListener | 414 FLAKY_BrowserCloseTabWhenOtherTabHasListener |
| 415 #endif | 415 #endif |
| 416 | 416 |
| 417 // Tests that if there's a renderer process with two tabs, one of which has an | 417 // Tests that if there's a renderer process with two tabs, one of which has an |
| 418 // unload handler, and the other doesn't, the tab that doesn't have an unload | 418 // unload handler, and the other doesn't, the tab that doesn't have an unload |
| 419 // handler can be closed. | 419 // handler can be closed. |
| 420 TEST_F(UnloadTest, MAYBE_BrowserCloseTabWhenOtherTabHasListener) { | 420 TEST_F(UnloadTest, MAYBE_BrowserCloseTabWhenOtherTabHasListener) { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 444 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_timeout_ms())); | 444 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_timeout_ms())); |
| 445 scoped_refptr<TabProxy> main_tab(browser->GetActiveTab()); | 445 scoped_refptr<TabProxy> main_tab(browser->GetActiveTab()); |
| 446 ASSERT_TRUE(main_tab.get()); | 446 ASSERT_TRUE(main_tab.get()); |
| 447 std::wstring main_title; | 447 std::wstring main_title; |
| 448 EXPECT_TRUE(main_tab->GetTabTitle(&main_title)); | 448 EXPECT_TRUE(main_tab->GetTabTitle(&main_title)); |
| 449 EXPECT_EQ(std::wstring(L"only_one_unload"), main_title); | 449 EXPECT_EQ(std::wstring(L"only_one_unload"), main_title); |
| 450 } | 450 } |
| 451 | 451 |
| 452 // TODO(ojan): Add tests for unload/beforeunload that have multiple tabs | 452 // TODO(ojan): Add tests for unload/beforeunload that have multiple tabs |
| 453 // and multiple windows. | 453 // and multiple windows. |
| OLD | NEW |