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

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

Issue 263683002: Set file tokens for NaCl main nexe if available to enable validation caching. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: concat filepath literal Created 6 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 | « chrome/test/data/nacl/nacl_test_data.gyp ('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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectFg1) { 433 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectFg1) {
434 RunNaClIntegrationTest(FILE_PATH_LITERAL( 434 RunNaClIntegrationTest(FILE_PATH_LITERAL(
435 "pm_redir_test.html?stream=stderr&thread=fg&delay_us=1000000")); 435 "pm_redir_test.html?stream=stderr&thread=fg&delay_us=1000000"));
436 } 436 }
437 437
438 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg1) { 438 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg1) {
439 RunNaClIntegrationTest(FILE_PATH_LITERAL( 439 RunNaClIntegrationTest(FILE_PATH_LITERAL(
440 "pm_redir_test.html?stream=stderr&thread=bg&delay_us=1000000")); 440 "pm_redir_test.html?stream=stderr&thread=bg&delay_us=1000000"));
441 } 441 }
442 442
443 class NaClBrowserTestNewlibExtension : public NaClBrowserTestNewlib {
444 public:
445 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
446 NaClBrowserTestNewlib::SetUpCommandLine(command_line);
447 base::FilePath src_root;
448 ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &src_root));
449
450 base::FilePath document_root;
451 ASSERT_TRUE(GetDocumentRoot(&document_root));
452
453 // Document root is relative to source root, and source root may not be CWD.
454 command_line->AppendSwitchPath(switches::kLoadExtension,
455 src_root.Append(document_root));
456 }
457 };
458
459 // TODO(ncbray) support glibc and PNaCl 443 // TODO(ncbray) support glibc and PNaCl
460 #if defined(OS_MACOSX) 444 #if defined(OS_MACOSX)
461 // crbug.com/375894 445 // crbug.com/375894
462 #define MAYBE_MimeHandler DISABLED_MimeHandler 446 #define MAYBE_MimeHandler DISABLED_MimeHandler
463 #else 447 #else
464 #define MAYBE_MimeHandler MimeHandler 448 #define MAYBE_MimeHandler MimeHandler
465 #endif 449 #endif
466 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) { 450 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) {
467 RunNaClIntegrationTest(FILE_PATH_LITERAL( 451 RunNaClIntegrationTest(FILE_PATH_LITERAL(
468 "ppapi_extension_mime_handler.html")); 452 "ppapi_extension_mime_handler.html"));
469 } 453 }
470 454
471 } // namespace 455 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/data/nacl/nacl_test_data.gyp ('k') | chrome/test/nacl/nacl_browsertest_uma.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698