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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/test/nacl/nacl_sandbox_test.h" 5 #include "chrome/test/nacl/nacl_sandbox_test.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/test/test_timeouts.h"
9 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
10 11
11 namespace { 12 namespace {
12 13
13 // Base url is specified in nacl_test. 14 // Base url is specified in nacl_test.
14 const FilePath::CharType kSrpcHwHtmlFileName[] = 15 const FilePath::CharType kSrpcHwHtmlFileName[] =
15 FILE_PATH_LITERAL("srpc_hw.html"); 16 FILE_PATH_LITERAL("srpc_hw.html");
16 17
17 } // namespace 18 } // namespace
18 19
(...skipping 13 matching lines...) Expand all
32 // We currently do not test the Chrome Linux SUID or seccomp sandboxes. 33 // We currently do not test the Chrome Linux SUID or seccomp sandboxes.
33 #endif 34 #endif
34 } 35 }
35 36
36 NaClSandboxTest::~NaClSandboxTest() { 37 NaClSandboxTest::~NaClSandboxTest() {
37 } 38 }
38 39
39 TEST_F(NaClSandboxTest, DISABLED_NaClOuterSBTest) { 40 TEST_F(NaClSandboxTest, DISABLED_NaClOuterSBTest) {
40 // Load a helloworld .nexe to trigger the nacl loader test. 41 // Load a helloworld .nexe to trigger the nacl loader test.
41 FilePath test_file(kSrpcHwHtmlFileName); 42 FilePath test_file(kSrpcHwHtmlFileName);
42 RunTest(test_file, action_max_timeout_ms()); 43 RunTest(test_file, TestTimeouts::action_max_timeout_ms());
43 } 44 }
OLDNEW
« 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