| 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 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1149 RunTest(positive_tests[i]); | 1149 RunTest(positive_tests[i]); |
| 1150 EXPECT_TRUE(content::RenderViewHostTester::HasTouchEventHandler(host)); | 1150 EXPECT_TRUE(content::RenderViewHostTester::HasTouchEventHandler(host)); |
| 1151 } | 1151 } |
| 1152 } | 1152 } |
| 1153 | 1153 |
| 1154 // View tests. | 1154 // View tests. |
| 1155 #define RUN_VIEW_SUBTESTS \ | 1155 #define RUN_VIEW_SUBTESTS \ |
| 1156 RunTestViaHTTP( \ | 1156 RunTestViaHTTP( \ |
| 1157 LIST_TEST(View_SizeChange) \ | 1157 LIST_TEST(View_SizeChange) \ |
| 1158 LIST_TEST(View_ClipChange) \ | 1158 LIST_TEST(View_ClipChange) \ |
| 1159 LIST_TEST(View_ScrollOffsetChange) \ |
| 1159 ) | 1160 ) |
| 1160 | 1161 |
| 1161 IN_PROC_BROWSER_TEST_F(PPAPITest, View) { | 1162 IN_PROC_BROWSER_TEST_F(PPAPITest, View) { |
| 1162 RUN_VIEW_SUBTESTS; | 1163 RUN_VIEW_SUBTESTS; |
| 1163 } | 1164 } |
| 1164 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View) { | 1165 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View) { |
| 1165 RUN_VIEW_SUBTESTS; | 1166 RUN_VIEW_SUBTESTS; |
| 1166 } | 1167 } |
| 1167 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, View) { | 1168 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, View) { |
| 1168 RUN_VIEW_SUBTESTS; | 1169 RUN_VIEW_SUBTESTS; |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1261 LIST_TEST(FlashDRM_GetHmonitor) | 1262 LIST_TEST(FlashDRM_GetHmonitor) |
| 1262 LIST_TEST(FlashDRM_GetVoucherFile)); | 1263 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1263 } | 1264 } |
| 1264 | 1265 |
| 1265 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1266 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1266 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1267 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1267 | 1268 |
| 1268 #if defined(OS_CHROMEOS) | 1269 #if defined(OS_CHROMEOS) |
| 1269 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1270 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1270 #endif | 1271 #endif |
| OLD | NEW |