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

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

Issue 907913002: Temporarily disable ppapi mojo test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable test in ppapi_browsertest.cc Created 5 years, 10 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 | « no previous file | no next file » | 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 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after
1565 } 1565 }
1566 void RunTestWithoutFlag() { 1566 void RunTestWithoutFlag() {
1567 RunTestInternal(); 1567 RunTestInternal();
1568 EXPECT_STREQ("Plugin crashed. 'NaCl module crashed'", result_.c_str()); 1568 EXPECT_STREQ("Plugin crashed. 'NaCl module crashed'", result_.c_str());
1569 } 1569 }
1570 private: 1570 private:
1571 std::string result_; 1571 std::string result_;
1572 }; 1572 };
1573 1573
1574 #if defined(OS_POSIX) 1574 #if defined(OS_POSIX)
1575 #define MAYBE_MOJO(test_name) test_name 1575 // TODO(teravest): Re-enable test after Mojo IRT support is enabled in
1576 // Chrome. http://crbug.com/454466
1577 #define MAYBE_MOJO(test_name) DISABLED_##test_name
1576 #else 1578 #else
1577 #define MAYBE_MOJO(test_name) DISABLED_##test_name 1579 #define MAYBE_MOJO(test_name) DISABLED_##test_name
1578 #endif 1580 #endif
1579 1581
1580 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) { 1582 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) {
1581 RunTest(); 1583 RunTest();
1582 } 1584 }
1583 1585
1584 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) { 1586 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) {
1585 RunTestWithoutFlag(); 1587 RunTestWithoutFlag();
1586 } 1588 }
1587 #endif 1589 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698