| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/process/process.h" | 8 #include "base/process/process.h" |
| 9 #include "base/test/test_timeouts.h" | 9 #include "base/test/test_timeouts.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 508 | 508 |
| 509 private: | 509 private: |
| 510 TabStripModel* tab_strip_model_; | 510 TabStripModel* tab_strip_model_; |
| 511 | 511 |
| 512 DISALLOW_COPY_AND_ASSIGN(WindowDestroyer); | 512 DISALLOW_COPY_AND_ASSIGN(WindowDestroyer); |
| 513 }; | 513 }; |
| 514 | 514 |
| 515 // Test to ensure that while iterating through all listeners in | 515 // Test to ensure that while iterating through all listeners in |
| 516 // RenderProcessHost and invalidating them, we remove them properly and don't | 516 // RenderProcessHost and invalidating them, we remove them properly and don't |
| 517 // access already freed objects. See http://crbug.com/255524. | 517 // access already freed objects. See http://crbug.com/255524. |
| 518 // Crashes on Win/Linux only. http://crbug.com/606485. |
| 519 #if defined(OS_WIN) || defined(OS_LINUX) |
| 520 #define MAYBE_CloseAllTabsDuringProcessDied \ |
| 521 DISABLED_CloseAllTabsDuringProcessDied |
| 522 #else |
| 523 #define MAYBE_CloseAllTabsDuringProcessDied CloseAllTabsDuringProcessDied |
| 524 #endif |
| 518 IN_PROC_BROWSER_TEST_F(ChromeRenderProcessHostTest, | 525 IN_PROC_BROWSER_TEST_F(ChromeRenderProcessHostTest, |
| 519 CloseAllTabsDuringProcessDied) { | 526 MAYBE_CloseAllTabsDuringProcessDied) { |
| 520 GURL url(chrome::kChromeUIOmniboxURL); | 527 GURL url(chrome::kChromeUIOmniboxURL); |
| 521 | 528 |
| 522 ui_test_utils::NavigateToURL(browser(), url); | 529 ui_test_utils::NavigateToURL(browser(), url); |
| 523 ui_test_utils::NavigateToURLWithDisposition( | 530 ui_test_utils::NavigateToURLWithDisposition( |
| 524 browser(), url, NEW_BACKGROUND_TAB, | 531 browser(), url, NEW_BACKGROUND_TAB, |
| 525 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 532 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
| 526 | 533 |
| 527 EXPECT_EQ(2, browser()->tab_strip_model()->count()); | 534 EXPECT_EQ(2, browser()->tab_strip_model()->count()); |
| 528 | 535 |
| 529 WebContents* wc1 = browser()->tab_strip_model()->GetWebContentsAt(0); | 536 WebContents* wc1 = browser()->tab_strip_model()->GetWebContentsAt(0); |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 686 content::ExecuteScript(audio_tab_web_contents_, | 693 content::ExecuteScript(audio_tab_web_contents_, |
| 687 "document.getElementById('audioPlayer').play();")); | 694 "document.getElementById('audioPlayer').play();")); |
| 688 | 695 |
| 689 // Wait until the two pages are not backgrounded. | 696 // Wait until the two pages are not backgrounded. |
| 690 while (no_audio_process_.IsProcessBackgrounded() || | 697 while (no_audio_process_.IsProcessBackgrounded() || |
| 691 audio_process_.IsProcessBackgrounded()) { | 698 audio_process_.IsProcessBackgrounded()) { |
| 692 base::RunLoop().RunUntilIdle(); | 699 base::RunLoop().RunUntilIdle(); |
| 693 base::PlatformThread::Sleep(TestTimeouts::tiny_timeout()); | 700 base::PlatformThread::Sleep(TestTimeouts::tiny_timeout()); |
| 694 } | 701 } |
| 695 } | 702 } |
| OLD | NEW |