summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-23 17:33:26 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-23 17:33:26 +0000
commit4f7251df426d5c347e57f1febee0a7943545db98 (patch)
tree8e6d0061073386d0b6f4446ac1bd8b0f6c7c2fc3 /chrome/test
parentc54016adf707a74ca0bc132dbe2b29555001592d (diff)
downloadchromium_src-4f7251df426d5c347e57f1febee0a7943545db98.zip
chromium_src-4f7251df426d5c347e57f1febee0a7943545db98.tar.gz
chromium_src-4f7251df426d5c347e57f1febee0a7943545db98.tar.bz2
Make NaCl integration test not flaky - fixed the problem that caused the test to fail.
BUG=30990 TEST=nacl_ui_test Review URL: http://codereview.chromium.org/519001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/nacl/nacl_test.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc
index ef795b8..5b9c85a 100644
--- a/chrome/test/nacl/nacl_test.cc
+++ b/chrome/test/nacl/nacl_test.cc
@@ -116,9 +116,7 @@ TEST_F(NaClTest, ServerTest) {
RunTest(server_test_file, action_max_timeout_ms());
}
-
-// http://crbug.com/30990
-TEST_F(NaClTest, FLAKY_SrpcHelloWorld) {
+TEST_F(NaClTest, SrpcHelloWorld) {
FilePath srpc_hw_file(kSrpcHwHtmlFileName);
RunTest(srpc_hw_file, action_max_timeout_ms());
}