| 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 "chrome/test/base/in_process_browser_test.h" | 5 #include "chrome/test/base/in_process_browser_test.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/feature_list.h" | 10 #include "base/feature_list.h" |
| (...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 // enable/disable the accessibility audit. | 564 // enable/disable the accessibility audit. |
| 565 run_accessibility_checks_for_test_case_ = false; | 565 run_accessibility_checks_for_test_case_ = false; |
| 566 | 566 |
| 567 if (browser_ && global_browser_set_up_function_) | 567 if (browser_ && global_browser_set_up_function_) |
| 568 ASSERT_TRUE(global_browser_set_up_function_(browser_)); | 568 ASSERT_TRUE(global_browser_set_up_function_(browser_)); |
| 569 | 569 |
| 570 #if defined(OS_MACOSX) | 570 #if defined(OS_MACOSX) |
| 571 autorelease_pool_->Recycle(); | 571 autorelease_pool_->Recycle(); |
| 572 #endif | 572 #endif |
| 573 | 573 |
| 574 // TODO(jam): remove this. | 574 #if defined(OS_CHROMEOS) // http://crbug.com/715735 |
| 575 disable_io_checks(); | 575 disable_io_checks(); |
| 576 #endif |
| 576 } | 577 } |
| 577 | 578 |
| 578 void InProcessBrowserTest::PostRunTestOnMainThread() { | 579 void InProcessBrowserTest::PostRunTestOnMainThread() { |
| 579 #if defined(OS_MACOSX) | 580 #if defined(OS_MACOSX) |
| 580 autorelease_pool_->Recycle(); | 581 autorelease_pool_->Recycle(); |
| 581 #endif | 582 #endif |
| 582 | 583 |
| 583 if (run_accessibility_checks_for_test_case_) { | 584 if (run_accessibility_checks_for_test_case_) { |
| 584 std::string error_message; | 585 std::string error_message; |
| 585 EXPECT_TRUE(RunAccessibilityChecks(&error_message)); | 586 EXPECT_TRUE(RunAccessibilityChecks(&error_message)); |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 622 // On the Mac, this eventually reaches | 623 // On the Mac, this eventually reaches |
| 623 // -[BrowserWindowController windowWillClose:], which will post a deferred | 624 // -[BrowserWindowController windowWillClose:], which will post a deferred |
| 624 // -autorelease on itself to ultimately destroy the Browser object. The line | 625 // -autorelease on itself to ultimately destroy the Browser object. The line |
| 625 // below is necessary to pump these pending messages to ensure all Browsers | 626 // below is necessary to pump these pending messages to ensure all Browsers |
| 626 // get deleted. | 627 // get deleted. |
| 627 content::RunAllPendingInMessageLoop(); | 628 content::RunAllPendingInMessageLoop(); |
| 628 delete autorelease_pool_; | 629 delete autorelease_pool_; |
| 629 autorelease_pool_ = NULL; | 630 autorelease_pool_ = NULL; |
| 630 #endif | 631 #endif |
| 631 } | 632 } |
| OLD | NEW |