| 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 "base/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/test/test_timeouts.h" | 6 #include "base/test/test_timeouts.h" |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "chrome/browser/extensions/extension_browsertest.h" | 8 #include "chrome/browser/extensions/extension_browsertest.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1316 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashDRM) { | 1316 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashDRM) { |
| 1317 RunTest( | 1317 RunTest( |
| 1318 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) | 1318 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) |
| 1319 // Only implemented on Windows and ChromeOS currently. | 1319 // Only implemented on Windows and ChromeOS currently. |
| 1320 LIST_TEST(FlashDRM_GetDeviceID) | 1320 LIST_TEST(FlashDRM_GetDeviceID) |
| 1321 #endif | 1321 #endif |
| 1322 LIST_TEST(FlashDRM_GetHmonitor) | 1322 LIST_TEST(FlashDRM_GetHmonitor) |
| 1323 LIST_TEST(FlashDRM_GetVoucherFile)); | 1323 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1324 } | 1324 } |
| 1325 | 1325 |
| 1326 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | |
| 1327 | |
| 1328 #if defined(OS_CHROMEOS) | 1326 #if defined(OS_CHROMEOS) |
| 1329 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1327 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1330 #endif | 1328 #endif |
| 1331 | 1329 |
| 1332 #if !defined(DISABLE_NACL) | 1330 #if !defined(DISABLE_NACL) |
| 1333 class PackagedAppTest : public ExtensionBrowserTest { | 1331 class PackagedAppTest : public ExtensionBrowserTest { |
| 1334 public: | 1332 public: |
| 1335 explicit PackagedAppTest(const std::string& toolchain) | 1333 explicit PackagedAppTest(const std::string& toolchain) |
| 1336 : toolchain_(toolchain) { } | 1334 : toolchain_(toolchain) { } |
| 1337 | 1335 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1456 #if defined(OS_WIN) | 1454 #if defined(OS_WIN) |
| 1457 #define MAYBE_MojoFailsWithoutFlag DISABLED_MojoFailsWithoutFlag | 1455 #define MAYBE_MojoFailsWithoutFlag DISABLED_MojoFailsWithoutFlag |
| 1458 #else | 1456 #else |
| 1459 #define MAYBE_MojoFailsWithoutFlag MojoFailsWithoutFlag | 1457 #define MAYBE_MojoFailsWithoutFlag MojoFailsWithoutFlag |
| 1460 #endif | 1458 #endif |
| 1461 | 1459 |
| 1462 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MojoFailsWithoutFlag) { | 1460 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MojoFailsWithoutFlag) { |
| 1463 RunTestWithoutFlag(); | 1461 RunTestWithoutFlag(); |
| 1464 } | 1462 } |
| 1465 #endif | 1463 #endif |
| OLD | NEW |