Commit 03e444e2 authored by jvoung@google.com's avatar jvoung@google.com

Re-enable nacl outer sandbox test using ppapi helloworld to trigger nacl.

TEST=nacl_sandbox_test
BUG=64973
Review URL: http://codereview.chromium.org/6379004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72534 0039d316-1c4b-4281-b951-d872f2087c98
parent f0557936
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
namespace { namespace {
// Base url is specified in nacl_test. // Base url is specified in nacl_test.
const FilePath::CharType kSrpcHwHtmlFileName[] = // We just need to visit a page that will trigger the NaCl loader.
FILE_PATH_LITERAL("srpc_hw.html"); const FilePath::CharType kANaClHtmlFile[] =
FILE_PATH_LITERAL("srpc_hw_ppapi.html");
} // namespace } // namespace
...@@ -37,8 +38,8 @@ NaClSandboxTest::NaClSandboxTest() { ...@@ -37,8 +38,8 @@ NaClSandboxTest::NaClSandboxTest() {
NaClSandboxTest::~NaClSandboxTest() { NaClSandboxTest::~NaClSandboxTest() {
} }
TEST_F(NaClSandboxTest, DISABLED_NaClOuterSBTest) { TEST_F(NaClSandboxTest, NaClOuterSBTest) {
// Load a helloworld .nexe to trigger the nacl loader test. // Load a helloworld .nexe to trigger the nacl loader test.
FilePath test_file(kSrpcHwHtmlFileName); FilePath test_file(kANaClHtmlFile);
RunTest(test_file, TestTimeouts::action_max_timeout_ms()); RunTest(test_file, TestTimeouts::action_max_timeout_ms());
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment