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

Side by Side Diff: chrome/test/ui/ppapi_uitest.cc

Issue 7399030: Remove --enable-p2papi flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/file_util.h" 5 #include "base/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
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/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/test/automation/tab_proxy.h" 10 #include "chrome/test/automation/tab_proxy.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 launch_arguments_.AppendSwitch(switches::kEnableFileCookies); 48 launch_arguments_.AppendSwitch(switches::kEnableFileCookies);
49 49
50 // Some stuff is hung off of the testing interface which is not enabled 50 // Some stuff is hung off of the testing interface which is not enabled
51 // by default. 51 // by default.
52 launch_arguments_.AppendSwitch(switches::kEnablePepperTesting); 52 launch_arguments_.AppendSwitch(switches::kEnablePepperTesting);
53 53
54 // Give unlimited quota for files to Pepper tests. 54 // Give unlimited quota for files to Pepper tests.
55 // TODO(dumi): remove this switch once we have a quota management 55 // TODO(dumi): remove this switch once we have a quota management
56 // system in place. 56 // system in place.
57 launch_arguments_.AppendSwitch(switches::kUnlimitedQuotaForFiles); 57 launch_arguments_.AppendSwitch(switches::kUnlimitedQuotaForFiles);
58
59 #if defined(ENABLE_P2P_APIS)
60 // Enable P2P API.
61 launch_arguments_.AppendSwitch(switches::kEnableP2PApi);
62 #endif // ENABLE_P2P_APIS
63 } 58 }
64 59
65 void RunTest(const std::string& test_case) { 60 void RunTest(const std::string& test_case) {
66 FilePath test_path; 61 FilePath test_path;
67 PathService::Get(base::DIR_SOURCE_ROOT, &test_path); 62 PathService::Get(base::DIR_SOURCE_ROOT, &test_path);
68 test_path = test_path.Append(FILE_PATH_LITERAL("ppapi")); 63 test_path = test_path.Append(FILE_PATH_LITERAL("ppapi"));
69 test_path = test_path.Append(FILE_PATH_LITERAL("tests")); 64 test_path = test_path.Append(FILE_PATH_LITERAL("tests"));
70 test_path = test_path.Append(FILE_PATH_LITERAL("test_case.html")); 65 test_path = test_path.Append(FILE_PATH_LITERAL("test_case.html"));
71 66
72 // Sanity check the file name. 67 // Sanity check the file name.
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 TEST_F(PPAPITest, MAYBE_DirectoryReader) { 215 TEST_F(PPAPITest, MAYBE_DirectoryReader) {
221 RunTestViaHTTP("DirectoryReader"); 216 RunTestViaHTTP("DirectoryReader");
222 } 217 }
223 218
224 #if defined(ENABLE_P2P_APIS) 219 #if defined(ENABLE_P2P_APIS)
225 // Flaky. http://crbug.com/84295 220 // Flaky. http://crbug.com/84295
226 TEST_F(PPAPITest, FLAKY_Transport) { 221 TEST_F(PPAPITest, FLAKY_Transport) {
227 RunTest("Transport"); 222 RunTest("Transport");
228 } 223 }
229 #endif // ENABLE_P2P_APIS 224 #endif // ENABLE_P2P_APIS
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/browser/renderer_host/browser_render_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698