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

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

Issue 1140953003: PPAPI Testing: Clean up location of ppapi::StripTestPrefixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move to shared_impl Created 5 years, 7 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
« no previous file with comments | « no previous file | content/public/test/ppapi_test_utils.h » ('j') | ppapi/tests/test_case.cc » ('J')
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 "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"
11 #include "chrome/browser/ui/browser_navigator.h" 11 #include "chrome/browser/ui/browser_navigator.h"
12 #include "chrome/browser/ui/extensions/app_launch_params.h" 12 #include "chrome/browser/ui/extensions/app_launch_params.h"
13 #include "chrome/browser/ui/extensions/application_launch.h" 13 #include "chrome/browser/ui/extensions/application_launch.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
16 #include "chrome/test/base/ui_test_utils.h" 16 #include "chrome/test/base/ui_test_utils.h"
17 #include "chrome/test/nacl/nacl_browsertest_util.h" 17 #include "chrome/test/nacl/nacl_browsertest_util.h"
18 #include "chrome/test/ppapi/ppapi_test.h" 18 #include "chrome/test/ppapi/ppapi_test.h"
19 #include "components/content_settings/core/browser/host_content_settings_map.h" 19 #include "components/content_settings/core/browser/host_content_settings_map.h"
20 #include "components/nacl/common/nacl_switches.h" 20 #include "components/nacl/common/nacl_switches.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "content/public/common/content_switches.h" 22 #include "content/public/common/content_switches.h"
23 #include "content/public/common/url_constants.h" 23 #include "content/public/common/url_constants.h"
24 #include "content/public/test/javascript_test_observer.h" 24 #include "content/public/test/javascript_test_observer.h"
25 #include "content/public/test/ppapi_test_utils.h"
26 #include "content/public/test/test_renderer_host.h" 25 #include "content/public/test/test_renderer_host.h"
27 #include "extensions/common/constants.h" 26 #include "extensions/common/constants.h"
28 #include "extensions/test/extension_test_message_listener.h" 27 #include "extensions/test/extension_test_message_listener.h"
28 #include "ppapi/shared_impl/test_utils.h"
29 29
30 using content::RenderViewHost; 30 using content::RenderViewHost;
31 31
32 // This macro finesses macro expansion to do what we want. 32 // This macro finesses macro expansion to do what we want.
33 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) 33 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name)
34 // Turn the given token into a string. This allows us to use precompiler stuff 34 // Turn the given token into a string. This allows us to use precompiler stuff
35 // to turn names into DISABLED_Foo, but still pass a string to RunTest. 35 // to turn names into DISABLED_Foo, but still pass a string to RunTest.
36 #define STRINGIFY(test_name) #test_name 36 #define STRINGIFY(test_name) #test_name
37 #define LIST_TEST(test_name) STRINGIFY(test_name) "," 37 #define LIST_TEST(test_name) STRINGIFY(test_name) ","
38 38
(...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after
1401 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest, 1401 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest,
1402 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) { 1402 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) {
1403 RunTests("packaged_app"); 1403 RunTests("packaged_app");
1404 } 1404 }
1405 1405
1406 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SocketPermissions) { 1406 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SocketPermissions) {
1407 RunTests("socket_permissions"); 1407 RunTests("socket_permissions");
1408 } 1408 }
1409 1409
1410 #endif 1410 #endif
OLDNEW
« no previous file with comments | « no previous file | content/public/test/ppapi_test_utils.h » ('j') | ppapi/tests/test_case.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698