Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 24039002: Pepper API implementation for output protection. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: something wrong with 'git cl upload'. upload again Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after
1541 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) 1541 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS)
1542 // Only implemented on Windows and ChromeOS currently. 1542 // Only implemented on Windows and ChromeOS currently.
1543 LIST_TEST(FlashDRM_GetDeviceID) 1543 LIST_TEST(FlashDRM_GetDeviceID)
1544 #endif 1544 #endif
1545 LIST_TEST(FlashDRM_GetHmonitor) 1545 LIST_TEST(FlashDRM_GetHmonitor)
1546 LIST_TEST(FlashDRM_GetVoucherFile)); 1546 LIST_TEST(FlashDRM_GetVoucherFile));
1547 } 1547 }
1548 1548
1549 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1549 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1550 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1550 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
1551
1552 #if defined(OS_CHROMEOS)
1553 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
1554 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698