| 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/ppapi/ppapi_test.h" | 5 #include "chrome/test/ppapi/ppapi_test.h" |
| 6 | 6 |
| 7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_navigator.h" | 10 #include "chrome/browser/ui/browser_navigator.h" |
| (...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK); | 714 chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK); |
| 715 params.disposition = NEW_BACKGROUND_TAB; | 715 params.disposition = NEW_BACKGROUND_TAB; |
| 716 ui_test_utils::NavigateToURL(¶ms); | 716 ui_test_utils::NavigateToURL(¶ms); |
| 717 } | 717 } |
| 718 | 718 |
| 719 // This test messes with tab visibility so is custom. | 719 // This test messes with tab visibility so is custom. |
| 720 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) { | 720 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) { |
| 721 // The plugin will be loaded in the foreground tab and will send us a message. | 721 // The plugin will be loaded in the foreground tab and will send us a message. |
| 722 TestFinishObserver observer( | 722 TestFinishObserver observer( |
| 723 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), | 723 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), |
| 724 TestTimeouts::action_max_timeout_ms()); | 724 TestTimeouts::action_max_timeout()); |
| 725 | 725 |
| 726 GURL url = GetTestFileUrl("View_PageHideShow"); | 726 GURL url = GetTestFileUrl("View_PageHideShow"); |
| 727 ui_test_utils::NavigateToURL(browser(), url); | 727 ui_test_utils::NavigateToURL(browser(), url); |
| 728 | 728 |
| 729 ASSERT_TRUE(observer.WaitForFinish()) << "Test timed out."; | 729 ASSERT_TRUE(observer.WaitForFinish()) << "Test timed out."; |
| 730 EXPECT_STREQ("TestPageHideShow:Created", observer.result().c_str()); | 730 EXPECT_STREQ("TestPageHideShow:Created", observer.result().c_str()); |
| 731 observer.Reset(); | 731 observer.Reset(); |
| 732 | 732 |
| 733 // Make a new tab to cause the original one to hide, this should trigger the | 733 // Make a new tab to cause the original one to hide, this should trigger the |
| 734 // next phase of the test. | 734 // next phase of the test. |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 797 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit) | 797 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit) |
| 798 | 798 |
| 799 TEST_PPAPI_IN_PROCESS(MouseCursor) | 799 TEST_PPAPI_IN_PROCESS(MouseCursor) |
| 800 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor) | 800 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor) |
| 801 TEST_PPAPI_NACL_VIA_HTTP(MouseCursor) | 801 TEST_PPAPI_NACL_VIA_HTTP(MouseCursor) |
| 802 | 802 |
| 803 // Only enabled in out-of-process mode. | 803 // Only enabled in out-of-process mode. |
| 804 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile) | 804 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile) |
| 805 | 805 |
| 806 #endif // ADDRESS_SANITIZER | 806 #endif // ADDRESS_SANITIZER |
| OLD | NEW |