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

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

Issue 1059233004: Init Mojo embedder for Windows NaCl plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | components/nacl.gyp » ('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 1434 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 EXPECT_STREQ("PASS", result_.c_str()); 1445 EXPECT_STREQ("PASS", result_.c_str());
1446 } 1446 }
1447 void RunTestWithoutFlag() { 1447 void RunTestWithoutFlag() {
1448 RunTestInternal(); 1448 RunTestInternal();
1449 EXPECT_STREQ("Plugin crashed. 'NaCl module crashed'", result_.c_str()); 1449 EXPECT_STREQ("Plugin crashed. 'NaCl module crashed'", result_.c_str());
1450 } 1450 }
1451 private: 1451 private:
1452 std::string result_; 1452 std::string result_;
1453 }; 1453 };
1454 1454
1455 #if defined(OS_POSIX) 1455 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, Mojo) {
1456 #define MAYBE_MOJO(test_name) test_name
1457 #else
1458 #define MAYBE_MOJO(test_name) DISABLED_##test_name
1459 #endif
1460
1461 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) {
1462 RunTest(); 1456 RunTest();
1463 } 1457 }
1464 1458
1465 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) { 1459 #if defined(OS_WIN)
1460 #define MAYBE_MojoFailsWithoutFlag DISABLED_MojoFailsWithoutFlag
1461 #else
1462 #define MAYBE_MojoFailsWithoutFlag MojoFailsWithoutFlag
1463 #endif
1464
1465 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MojoFailsWithoutFlag) {
1466 RunTestWithoutFlag(); 1466 RunTestWithoutFlag();
1467 } 1467 }
1468 #endif 1468 #endif
OLDNEW
« no previous file with comments | « no previous file | components/nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698