| 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/content_settings/host_content_settings_map.h" | 9 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1560 chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK); | 1560 chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK); |
| 1561 params.disposition = NEW_BACKGROUND_TAB; | 1561 params.disposition = NEW_BACKGROUND_TAB; |
| 1562 ui_test_utils::NavigateToURL(¶ms); | 1562 ui_test_utils::NavigateToURL(¶ms); |
| 1563 } | 1563 } |
| 1564 | 1564 |
| 1565 // This test messes with tab visibility so is custom. | 1565 // This test messes with tab visibility so is custom. |
| 1566 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) { | 1566 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) { |
| 1567 // The plugin will be loaded in the foreground tab and will send us a message. | 1567 // The plugin will be loaded in the foreground tab and will send us a message. |
| 1568 PPAPITestMessageHandler handler; | 1568 PPAPITestMessageHandler handler; |
| 1569 JavascriptTestObserver observer( | 1569 JavascriptTestObserver observer( |
| 1570 browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), | 1570 browser()->tab_strip_model()->GetActiveWebContents(), |
| 1571 &handler); | 1571 &handler); |
| 1572 | 1572 |
| 1573 GURL url = GetTestFileUrl("View_PageHideShow"); | 1573 GURL url = GetTestFileUrl("View_PageHideShow"); |
| 1574 ui_test_utils::NavigateToURL(browser(), url); | 1574 ui_test_utils::NavigateToURL(browser(), url); |
| 1575 | 1575 |
| 1576 ASSERT_TRUE(observer.Run()) << handler.error_message(); | 1576 ASSERT_TRUE(observer.Run()) << handler.error_message(); |
| 1577 EXPECT_STREQ("TestPageHideShow:Created", handler.message().c_str()); | 1577 EXPECT_STREQ("TestPageHideShow:Created", handler.message().c_str()); |
| 1578 observer.Reset(); | 1578 observer.Reset(); |
| 1579 | 1579 |
| 1580 // Make a new tab to cause the original one to hide, this should trigger the | 1580 // Make a new tab to cause the original one to hide, this should trigger the |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1714 LIST_TEST(FlashDRM_GetHmonitor) | 1714 LIST_TEST(FlashDRM_GetHmonitor) |
| 1715 LIST_TEST(FlashDRM_GetVoucherFile)); | 1715 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1716 } | 1716 } |
| 1717 | 1717 |
| 1718 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1718 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1719 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1719 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1720 | 1720 |
| 1721 #if defined(OS_CHROMEOS) | 1721 #if defined(OS_CHROMEOS) |
| 1722 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1722 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1723 #endif | 1723 #endif |
| OLD | NEW |