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

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

Issue 741943003: Fix disable_nacl=1 build of browser_tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Actually, make these flags unavailable at compile-time too. Created 6 years, 1 month 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 | components/nacl/common/nacl_switches.h » ('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 "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"
(...skipping 1476 matching lines...) Expand 10 before | Expand all | Expand 10 after
1487 #endif 1487 #endif
1488 } 1488 }
1489 }; 1489 };
1490 1490
1491 // TODO(hidehiko): Switch for NonSfi tests to use nacl_helper_nonsfi, when 1491 // TODO(hidehiko): Switch for NonSfi tests to use nacl_helper_nonsfi, when
1492 // it is launched officially. See NaClBrowserTestPnaclTransitionalNonSfi 1492 // it is launched officially. See NaClBrowserTestPnaclTransitionalNonSfi
1493 // for more details. 1493 // for more details.
1494 class TransitionalNonSfiPackagedAppTest : public NonSfiPackagedAppTest { 1494 class TransitionalNonSfiPackagedAppTest : public NonSfiPackagedAppTest {
1495 public: 1495 public:
1496 void SetUpCommandLine(base::CommandLine* command_line) override { 1496 void SetUpCommandLine(base::CommandLine* command_line) override {
1497 #if !defined(DISABLE_NACL)
1497 NonSfiPackagedAppTest::SetUpCommandLine(command_line); 1498 NonSfiPackagedAppTest::SetUpCommandLine(command_line);
1498 command_line->AppendSwitch(switches::kUseNaClHelperNonSfi); 1499 command_line->AppendSwitch(switches::kUseNaClHelperNonSfi);
1500 #endif
1499 } 1501 }
1500 }; 1502 };
1501 1503
1502 // Load a packaged app, and wait for it to successfully post a "hello" message 1504 // Load a packaged app, and wait for it to successfully post a "hello" message
1503 // back. 1505 // back.
1504 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SuccessfulLoad) { 1506 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SuccessfulLoad) {
1505 RunTests(); 1507 RunTests();
1506 } 1508 }
1507 1509
1508 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, 1510 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest,
1509 MAYBE_PNACL_NONSFI(SuccessfulLoad)) { 1511 MAYBE_PNACL_NONSFI(SuccessfulLoad)) {
1510 RunTests(); 1512 RunTests();
1511 } 1513 }
1512 1514
1513 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest, 1515 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest,
1514 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) { 1516 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) {
1515 RunTests(); 1517 RunTests();
1516 } 1518 }
OLDNEW
« no previous file with comments | « no previous file | components/nacl/common/nacl_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698