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

Unified Diff: chrome/test/nacl/nacl_sandbox_test.cc

Issue 6354005: Remove action_max_timeout_ms and fix all the callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/interactive_ui/npapi_interactive_test.cc ('k') | chrome/test/nacl/nacl_ui_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/nacl/nacl_sandbox_test.cc
diff --git a/chrome/test/nacl/nacl_sandbox_test.cc b/chrome/test/nacl/nacl_sandbox_test.cc
index 9472ea04e1a65efd4f2079b3ad35d955ac61b411..28e6b87dda50a8aa0beeb8702dd592240e54a5fa 100644
--- a/chrome/test/nacl/nacl_sandbox_test.cc
+++ b/chrome/test/nacl/nacl_sandbox_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -6,6 +6,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
+#include "base/test/test_timeouts.h"
#include "chrome/common/chrome_switches.h"
namespace {
@@ -39,5 +40,5 @@ NaClSandboxTest::~NaClSandboxTest() {
TEST_F(NaClSandboxTest, DISABLED_NaClOuterSBTest) {
// Load a helloworld .nexe to trigger the nacl loader test.
FilePath test_file(kSrpcHwHtmlFileName);
- RunTest(test_file, action_max_timeout_ms());
+ RunTest(test_file, TestTimeouts::action_max_timeout_ms());
}
« no previous file with comments | « chrome/test/interactive_ui/npapi_interactive_test.cc ('k') | chrome/test/nacl/nacl_ui_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698