summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorjvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 02:02:38 +0000
committerjvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 02:02:38 +0000
commit5af9153bcd1970bba310e00f0bd9f201b5cd952a (patch)
treeff3e999eaa6ca041fe760b826d27e13d92946333 /chrome/test
parentb2a587e9e7037ce2d8069313098871c41dba568b (diff)
downloadchromium_src-5af9153bcd1970bba310e00f0bd9f201b5cd952a.zip
chromium_src-5af9153bcd1970bba310e00f0bd9f201b5cd952a.tar.gz
chromium_src-5af9153bcd1970bba310e00f0bd9f201b5cd952a.tar.bz2
Remove flaky marker from nacl_sandbox_test now that it is fixed.
BUG=50121 Review URL: http://codereview.chromium.org/5047001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/nacl/nacl_sandbox_test.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/test/nacl/nacl_sandbox_test.cc b/chrome/test/nacl/nacl_sandbox_test.cc
index 87dc619..c1935b1 100644
--- a/chrome/test/nacl/nacl_sandbox_test.cc
+++ b/chrome/test/nacl/nacl_sandbox_test.cc
@@ -36,8 +36,7 @@ NaClSandboxTest::NaClSandboxTest() {
NaClSandboxTest::~NaClSandboxTest() {
}
-// http://crbug.com/50121
-TEST_F(NaClSandboxTest, FLAKY_NaClOuterSBTest) {
+TEST_F(NaClSandboxTest, NaClOuterSBTest) {
// Load a helloworld .nexe to trigger the nacl loader test.
FilePath test_file(kSrpcHwHtmlFileName);
RunTest(test_file, action_max_timeout_ms());