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

Side by Side Diff: chrome/test/nacl/nacl_browsertest.cc

Issue 637933002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « chrome/test/logging/win/test_log_collector.cc ('k') | chrome/test/nacl/nacl_browsertest_uma.cc » ('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 <stdio.h> 5 #include <stdio.h>
6 #if defined(OS_POSIX) 6 #if defined(OS_POSIX)
7 #include <unistd.h> 7 #include <unistd.h>
8 #elif defined(OS_WIN) 8 #elif defined(OS_WIN)
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 RunLoadTest(FILE_PATH_LITERAL("cross_origin/cors_no_cookie.html")); 207 RunLoadTest(FILE_PATH_LITERAL("cross_origin/cors_no_cookie.html"));
208 } 208 }
209 209
210 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, RelativeManifest) { 210 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, RelativeManifest) {
211 RunLoadTest(FILE_PATH_LITERAL("manifest/relative_manifest.html")); 211 RunLoadTest(FILE_PATH_LITERAL("manifest/relative_manifest.html"));
212 } 212 }
213 213
214 // Test with the NaCl debug flag turned on. 214 // Test with the NaCl debug flag turned on.
215 class NaClBrowserTestPnaclDebug : public NaClBrowserTestPnacl { 215 class NaClBrowserTestPnaclDebug : public NaClBrowserTestPnacl {
216 public: 216 public:
217 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 217 virtual void SetUpCommandLine(CommandLine* command_line) override {
218 NaClBrowserTestPnacl::SetUpCommandLine(command_line); 218 NaClBrowserTestPnacl::SetUpCommandLine(command_line);
219 // Turn on debugging to influence the PNaCl URL loaded 219 // Turn on debugging to influence the PNaCl URL loaded
220 command_line->AppendSwitch(switches::kEnableNaClDebug); 220 command_line->AppendSwitch(switches::kEnableNaClDebug);
221 // On windows, the debug stub requires --no-sandbox: 221 // On windows, the debug stub requires --no-sandbox:
222 // crbug.com/265624 222 // crbug.com/265624
223 #if defined(OS_WIN) 223 #if defined(OS_WIN)
224 command_line->AppendSwitch(switches::kNoSandbox); 224 command_line->AppendSwitch(switches::kNoSandbox);
225 #endif 225 #endif
226 } 226 }
227 227
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 LOG(INFO) << "Waiting for script to exit (which waits for embed to die)."; 271 LOG(INFO) << "Waiting for script to exit (which waits for embed to die).";
272 base::WaitForExitCode(test_script, &exit_code); 272 base::WaitForExitCode(test_script, &exit_code);
273 EXPECT_EQ(0, exit_code); 273 EXPECT_EQ(0, exit_code);
274 } 274 }
275 }; 275 };
276 276
277 // Test with the NaCl debug flag turned on, but mask off every URL 277 // Test with the NaCl debug flag turned on, but mask off every URL
278 // so that nothing is actually debugged. 278 // so that nothing is actually debugged.
279 class NaClBrowserTestPnaclDebugMasked : public NaClBrowserTestPnaclDebug { 279 class NaClBrowserTestPnaclDebugMasked : public NaClBrowserTestPnaclDebug {
280 public: 280 public:
281 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 281 virtual void SetUpCommandLine(CommandLine* command_line) override {
282 NaClBrowserTestPnaclDebug::SetUpCommandLine(command_line); 282 NaClBrowserTestPnaclDebug::SetUpCommandLine(command_line);
283 command_line->AppendSwitchASCII(switches::kNaClDebugMask, 283 command_line->AppendSwitchASCII(switches::kNaClDebugMask,
284 "!<all_urls>"); 284 "!<all_urls>");
285 } 285 }
286 }; 286 };
287 287
288 // The tests which actually start a debug session must use the debug stub 288 // The tests which actually start a debug session must use the debug stub
289 // to continue the app startup. However, NaCl on windows can't open the 289 // to continue the app startup. However, NaCl on windows can't open the
290 // debug stub socket in the browser process as needed by the test. 290 // debug stub socket in the browser process as needed by the test.
291 // See http://crbug.com/157312. 291 // See http://crbug.com/157312.
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 } 361 }
362 362
363 // TODO(ncbray) support glibc and PNaCl 363 // TODO(ncbray) support glibc and PNaCl
364 // flaky: crbug.com/375894 364 // flaky: crbug.com/375894
365 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { 365 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) {
366 RunNaClIntegrationTest(FILE_PATH_LITERAL( 366 RunNaClIntegrationTest(FILE_PATH_LITERAL(
367 "ppapi_extension_mime_handler.html")); 367 "ppapi_extension_mime_handler.html"));
368 } 368 }
369 369
370 } // namespace 370 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/logging/win/test_log_collector.cc ('k') | chrome/test/nacl/nacl_browsertest_uma.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698