| 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" | |
| 10 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/browser/ui/browser_navigator.h" | 11 #include "chrome/browser/ui/browser_navigator.h" |
| 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 14 #include "chrome/test/base/ui_test_utils.h" | 13 #include "chrome/test/base/ui_test_utils.h" |
| 15 #include "chrome/test/nacl/nacl_browsertest_util.h" | 14 #include "chrome/test/nacl/nacl_browsertest_util.h" |
| 15 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
| 17 #include "content/public/common/url_constants.h" | 17 #include "content/public/common/url_constants.h" |
| 18 #include "content/public/test/javascript_test_observer.h" | 18 #include "content/public/test/javascript_test_observer.h" |
| 19 #include "content/public/test/test_renderer_host.h" | 19 #include "content/public/test/test_renderer_host.h" |
| 20 #include "ppapi/shared_impl/test_harness_utils.h" | 20 #include "ppapi/shared_impl/test_harness_utils.h" |
| 21 | 21 |
| 22 using content::RenderViewHost; | 22 using content::RenderViewHost; |
| 23 | 23 |
| 24 // This macro finesses macro expansion to do what we want. | 24 // This macro finesses macro expansion to do what we want. |
| 25 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) | 25 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) |
| (...skipping 1297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1323 LIST_TEST(FlashDRM_GetHmonitor) | 1323 LIST_TEST(FlashDRM_GetHmonitor) |
| 1324 LIST_TEST(FlashDRM_GetVoucherFile)); | 1324 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1325 } | 1325 } |
| 1326 | 1326 |
| 1327 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1327 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1328 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1328 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1329 | 1329 |
| 1330 #if defined(OS_CHROMEOS) | 1330 #if defined(OS_CHROMEOS) |
| 1331 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1331 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1332 #endif | 1332 #endif |
| OLD | NEW |