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

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

Issue 2570573002: Convert RLZ to a buildflag header (Closed)
Patch Set: iOS Created 4 years 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
« no previous file with comments | « chrome/test/DEPS ('k') | components/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/test/test_timeouts.h" 9 #include "base/test/test_timeouts.h"
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 13 matching lines...) Expand all
24 #include "components/content_settings/core/browser/host_content_settings_map.h" 24 #include "components/content_settings/core/browser/host_content_settings_map.h"
25 #include "components/nacl/common/nacl_switches.h" 25 #include "components/nacl/common/nacl_switches.h"
26 #include "content/public/browser/web_contents.h" 26 #include "content/public/browser/web_contents.h"
27 #include "content/public/common/content_switches.h" 27 #include "content/public/common/content_switches.h"
28 #include "content/public/common/url_constants.h" 28 #include "content/public/common/url_constants.h"
29 #include "content/public/test/javascript_test_observer.h" 29 #include "content/public/test/javascript_test_observer.h"
30 #include "content/public/test/test_renderer_host.h" 30 #include "content/public/test/test_renderer_host.h"
31 #include "extensions/common/constants.h" 31 #include "extensions/common/constants.h"
32 #include "extensions/test/extension_test_message_listener.h" 32 #include "extensions/test/extension_test_message_listener.h"
33 #include "ppapi/shared_impl/test_utils.h" 33 #include "ppapi/shared_impl/test_utils.h"
34 #include "rlz/features/features.h"
34 35
35 #if defined(OS_MACOSX) 36 #if defined(OS_MACOSX)
36 #include "base/mac/mac_util.h" 37 #include "base/mac/mac_util.h"
37 #endif 38 #endif
38 39
39 using content::RenderViewHost; 40 using content::RenderViewHost;
40 41
41 // This macro finesses macro expansion to do what we want. 42 // This macro finesses macro expansion to do what we want.
42 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) 43 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name)
43 // Turn the given token into a string. This allows us to use precompiler stuff 44 // Turn the given token into a string. This allows us to use precompiler stuff
(...skipping 1182 matching lines...) Expand 10 before | Expand all | Expand 10 after
1226 TEST_PPAPI_OUT_OF_PROCESS(PDF) 1227 TEST_PPAPI_OUT_OF_PROCESS(PDF)
1227 1228
1228 // TODO(dalecurtis): Renable once the platform verification infobar has been 1229 // TODO(dalecurtis): Renable once the platform verification infobar has been
1229 // implemented; see http://crbug.com/270908 1230 // implemented; see http://crbug.com/270908
1230 // #if defined(OS_CHROMEOS) 1231 // #if defined(OS_CHROMEOS)
1231 // TEST_PPAPI_OUT_OF_PROCESS(PlatformVerificationPrivate) 1232 // TEST_PPAPI_OUT_OF_PROCESS(PlatformVerificationPrivate)
1232 // #endif 1233 // #endif
1233 1234
1234 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashDRM) { 1235 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashDRM) {
1235 RunTest( 1236 RunTest(
1236 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) 1237 #if (defined(OS_WIN) && BUILDFLAG(ENABLE_RLZ)) || defined(OS_CHROMEOS)
1237 // Only implemented on Windows and ChromeOS currently. 1238 // Only implemented on Windows and ChromeOS currently.
1238 LIST_TEST(FlashDRM_GetDeviceID) 1239 LIST_TEST(FlashDRM_GetDeviceID)
1239 #endif 1240 #endif
1240 LIST_TEST(FlashDRM_GetHmonitor) 1241 LIST_TEST(FlashDRM_GetHmonitor)
1241 LIST_TEST(FlashDRM_GetVoucherFile)); 1242 LIST_TEST(FlashDRM_GetVoucherFile));
1242 } 1243 }
1243 1244
1244 #if defined(OS_CHROMEOS) 1245 #if defined(OS_CHROMEOS)
1245 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) 1246 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
1246 #endif 1247 #endif
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
1321 MAYBE_PPAPI_NACL(NoSocketPermissions)) { 1322 MAYBE_PPAPI_NACL(NoSocketPermissions)) {
1322 RunTests("no_socket_permissions"); 1323 RunTests("no_socket_permissions");
1323 } 1324 }
1324 1325
1325 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, 1326 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
1326 MAYBE_PPAPI_NACL(SocketPermissions)) { 1327 MAYBE_PPAPI_NACL(SocketPermissions)) {
1327 RunTests("socket_permissions"); 1328 RunTests("socket_permissions");
1328 } 1329 }
1329 1330
1330 #endif 1331 #endif
OLDNEW
« no previous file with comments | « chrome/test/DEPS ('k') | components/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698