| 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 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1110 | 1110 |
| 1111 GURL url = GetTestFileUrl("View_PageHideShow"); | 1111 GURL url = GetTestFileUrl("View_PageHideShow"); |
| 1112 ui_test_utils::NavigateToURL(browser(), url); | 1112 ui_test_utils::NavigateToURL(browser(), url); |
| 1113 | 1113 |
| 1114 ASSERT_TRUE(observer.Run()) << handler.error_message(); | 1114 ASSERT_TRUE(observer.Run()) << handler.error_message(); |
| 1115 EXPECT_STREQ("TestPageHideShow:Created", handler.message().c_str()); | 1115 EXPECT_STREQ("TestPageHideShow:Created", handler.message().c_str()); |
| 1116 observer.Reset(); | 1116 observer.Reset(); |
| 1117 | 1117 |
| 1118 // Make a new tab to cause the original one to hide, this should trigger the | 1118 // Make a new tab to cause the original one to hide, this should trigger the |
| 1119 // next phase of the test. | 1119 // next phase of the test. |
| 1120 chrome::NavigateParams params(browser(), GURL(content::kAboutBlankURL), | 1120 chrome::NavigateParams params( |
| 1121 content::PAGE_TRANSITION_LINK); | 1121 browser(), GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_LINK); |
| 1122 params.disposition = NEW_FOREGROUND_TAB; | 1122 params.disposition = NEW_FOREGROUND_TAB; |
| 1123 ui_test_utils::NavigateToURL(¶ms); | 1123 ui_test_utils::NavigateToURL(¶ms); |
| 1124 | 1124 |
| 1125 // Wait until the test acks that it got hidden. | 1125 // Wait until the test acks that it got hidden. |
| 1126 ASSERT_TRUE(observer.Run()) << handler.error_message(); | 1126 ASSERT_TRUE(observer.Run()) << handler.error_message(); |
| 1127 EXPECT_STREQ("TestPageHideShow:Hidden", handler.message().c_str()); | 1127 EXPECT_STREQ("TestPageHideShow:Hidden", handler.message().c_str()); |
| 1128 observer.Reset(); | 1128 observer.Reset(); |
| 1129 | 1129 |
| 1130 // Switch back to the test tab. | 1130 // Switch back to the test tab. |
| 1131 browser()->tab_strip_model()->ActivateTabAt(0, true); | 1131 browser()->tab_strip_model()->ActivateTabAt(0, true); |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1257 LIST_TEST(FlashDRM_GetHmonitor) | 1257 LIST_TEST(FlashDRM_GetHmonitor) |
| 1258 LIST_TEST(FlashDRM_GetVoucherFile)); | 1258 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1259 } | 1259 } |
| 1260 | 1260 |
| 1261 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1261 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1262 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1262 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1263 | 1263 |
| 1264 #if defined(OS_CHROMEOS) | 1264 #if defined(OS_CHROMEOS) |
| 1265 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1265 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1266 #endif | 1266 #endif |
| OLD | NEW |