| 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 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1143 | 1143 |
| 1144 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_CreateInvisible) { | 1144 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_CreateInvisible) { |
| 1145 // Make a second tab in the foreground. | 1145 // Make a second tab in the foreground. |
| 1146 GURL url = GetTestFileUrl("View_CreatedInvisible"); | 1146 GURL url = GetTestFileUrl("View_CreatedInvisible"); |
| 1147 chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK); | 1147 chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK); |
| 1148 params.disposition = NEW_BACKGROUND_TAB; | 1148 params.disposition = NEW_BACKGROUND_TAB; |
| 1149 ui_test_utils::NavigateToURL(¶ms); | 1149 ui_test_utils::NavigateToURL(¶ms); |
| 1150 } | 1150 } |
| 1151 | 1151 |
| 1152 // This test messes with tab visibility so is custom. | 1152 // This test messes with tab visibility so is custom. |
| 1153 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) { | 1153 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, DISABLED_View_PageHideShow) { |
| 1154 // The plugin will be loaded in the foreground tab and will send us a message. | 1154 // The plugin will be loaded in the foreground tab and will send us a message. |
| 1155 PPAPITestMessageHandler handler; | 1155 PPAPITestMessageHandler handler; |
| 1156 content::JavascriptTestObserver observer( | 1156 content::JavascriptTestObserver observer( |
| 1157 browser()->tab_strip_model()->GetActiveWebContents(), | 1157 browser()->tab_strip_model()->GetActiveWebContents(), |
| 1158 &handler); | 1158 &handler); |
| 1159 | 1159 |
| 1160 GURL url = GetTestFileUrl("View_PageHideShow"); | 1160 GURL url = GetTestFileUrl("View_PageHideShow"); |
| 1161 ui_test_utils::NavigateToURL(browser(), url); | 1161 ui_test_utils::NavigateToURL(browser(), url); |
| 1162 | 1162 |
| 1163 ASSERT_TRUE(observer.Run()) << handler.error_message(); | 1163 ASSERT_TRUE(observer.Run()) << handler.error_message(); |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1350 LIST_TEST(FlashDRM_GetHmonitor) | 1350 LIST_TEST(FlashDRM_GetHmonitor) |
| 1351 LIST_TEST(FlashDRM_GetVoucherFile)); | 1351 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1352 } | 1352 } |
| 1353 | 1353 |
| 1354 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1354 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1355 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1355 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1356 | 1356 |
| 1357 #if defined(OS_CHROMEOS) | 1357 #if defined(OS_CHROMEOS) |
| 1358 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1358 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1359 #endif | 1359 #endif |
| OLD | NEW |