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 <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" | |
11 #include "build/build_config.h" | 10 #include "build/build_config.h" |
12 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 11 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
13 #include "chrome/browser/extensions/extension_browsertest.h" | 12 #include "chrome/browser/extensions/extension_browsertest.h" |
14 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/browser/ui/browser_navigator_params.h" | 15 #include "chrome/browser/ui/browser_navigator_params.h" |
17 #include "chrome/browser/ui/extensions/app_launch_params.h" | 16 #include "chrome/browser/ui/extensions/app_launch_params.h" |
18 #include "chrome/browser/ui/extensions/application_launch.h" | 17 #include "chrome/browser/ui/extensions/application_launch.h" |
19 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
20 #include "chrome/common/chrome_paths.h" | 19 #include "chrome/common/chrome_paths.h" |
21 #include "chrome/test/base/ui_test_utils.h" | 20 #include "chrome/test/base/ui_test_utils.h" |
22 #include "chrome/test/nacl/nacl_browsertest_util.h" | 21 #include "chrome/test/nacl/nacl_browsertest_util.h" |
23 #include "chrome/test/ppapi/ppapi_test.h" | 22 #include "chrome/test/ppapi/ppapi_test.h" |
24 #include "components/content_settings/core/browser/host_content_settings_map.h" | 23 #include "components/content_settings/core/browser/host_content_settings_map.h" |
25 #include "components/nacl/common/nacl_switches.h" | 24 #include "components/nacl/common/nacl_switches.h" |
26 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
27 #include "content/public/common/content_switches.h" | 26 #include "content/public/common/content_switches.h" |
28 #include "content/public/common/url_constants.h" | 27 #include "content/public/common/url_constants.h" |
29 #include "content/public/test/javascript_test_observer.h" | 28 #include "content/public/test/javascript_test_observer.h" |
30 #include "content/public/test/test_renderer_host.h" | 29 #include "content/public/test/test_renderer_host.h" |
31 #include "extensions/common/constants.h" | 30 #include "extensions/common/constants.h" |
32 #include "extensions/test/extension_test_message_listener.h" | 31 #include "extensions/test/extension_test_message_listener.h" |
33 #include "ppapi/shared_impl/test_utils.h" | 32 #include "ppapi/shared_impl/test_utils.h" |
34 #include "rlz/features/features.h" | 33 #include "rlz/features/features.h" |
35 | 34 |
36 #if defined(OS_MACOSX) | 35 #if defined(OS_MACOSX) |
37 #include "base/mac/mac_util.h" | 36 #include "base/mac/mac_util.h" |
38 #endif | 37 #endif |
39 | 38 |
| 39 #if defined(OS_WIN) |
| 40 #include "base/win/windows_version.h" |
| 41 #endif |
| 42 |
40 using content::RenderViewHost; | 43 using content::RenderViewHost; |
41 | 44 |
42 // This macro finesses macro expansion to do what we want. | 45 // This macro finesses macro expansion to do what we want. |
43 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) | 46 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) |
44 // Turn the given token into a string. This allows us to use precompiler stuff | 47 // Turn the given token into a string. This allows us to use precompiler stuff |
45 // to turn names into DISABLED_Foo, but still pass a string to RunTest. | 48 // to turn names into DISABLED_Foo, but still pass a string to RunTest. |
46 #define STRINGIFY(test_name) #test_name | 49 #define STRINGIFY(test_name) #test_name |
47 #define LIST_TEST(test_name) STRINGIFY(test_name) "," | 50 #define LIST_TEST(test_name) STRINGIFY(test_name) "," |
48 | 51 |
49 // Use these macros to run the tests for a specific interface. | 52 // Use these macros to run the tests for a specific interface. |
(...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1322 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1325 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
1323 RunTests("no_socket_permissions"); | 1326 RunTests("no_socket_permissions"); |
1324 } | 1327 } |
1325 | 1328 |
1326 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1329 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
1327 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1330 MAYBE_PPAPI_NACL(SocketPermissions)) { |
1328 RunTests("socket_permissions"); | 1331 RunTests("socket_permissions"); |
1329 } | 1332 } |
1330 | 1333 |
1331 #endif | 1334 #endif |
OLD | NEW |