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

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

Issue 392023002: Remove disable-pnacl flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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) 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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 379 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
380 MAYBE_PNACL(PnaclExceptionHandlingDisabled)) { 380 MAYBE_PNACL(PnaclExceptionHandlingDisabled)) {
381 RunNaClIntegrationTest(FILE_PATH_LITERAL( 381 RunNaClIntegrationTest(FILE_PATH_LITERAL(
382 "pnacl_exception_handling_disabled.html")); 382 "pnacl_exception_handling_disabled.html"));
383 } 383 }
384 384
385 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) { 385 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) {
386 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); 386 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
387 } 387 }
388 388
389 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled, PnaclMimeType) {
390 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
391 }
392
393 class NaClBrowserTestNewlibStdoutPM : public NaClBrowserTestNewlib { 389 class NaClBrowserTestNewlibStdoutPM : public NaClBrowserTestNewlib {
394 public: 390 public:
395 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 391 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
396 // Env needs to be set early because nacl_helper is spawned before the test 392 // Env needs to be set early because nacl_helper is spawned before the test
397 // body on Linux. 393 // body on Linux.
398 scoped_ptr<base::Environment> env(base::Environment::Create()); 394 scoped_ptr<base::Environment> env(base::Environment::Create());
399 env->SetVar("NACL_EXE_STDOUT", "DEBUG_ONLY:dev://postmessage"); 395 env->SetVar("NACL_EXE_STDOUT", "DEBUG_ONLY:dev://postmessage");
400 NaClBrowserTestNewlib::SetUpInProcessBrowserTestFixture(); 396 NaClBrowserTestNewlib::SetUpInProcessBrowserTestFixture();
401 } 397 }
402 }; 398 };
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 #define MAYBE_MimeHandler DISABLED_MimeHandler 454 #define MAYBE_MimeHandler DISABLED_MimeHandler
459 #else 455 #else
460 #define MAYBE_MimeHandler MimeHandler 456 #define MAYBE_MimeHandler MimeHandler
461 #endif 457 #endif
462 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) { 458 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) {
463 RunNaClIntegrationTest(FILE_PATH_LITERAL( 459 RunNaClIntegrationTest(FILE_PATH_LITERAL(
464 "ppapi_extension_mime_handler.html")); 460 "ppapi_extension_mime_handler.html"));
465 } 461 }
466 462
467 } // namespace 463 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698