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

Side by Side Diff: chrome/test/nacl/nacl_browsertest.cc

Issue 670603002: Linux sandbox: Tighten up the NaCl sandbox policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing include. Created 6 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <stdio.h> 5 #include <stdio.h>
6 #if defined(OS_POSIX) 6 #if defined(OS_POSIX)
7 #include <unistd.h> 7 #include <unistd.h>
8 #elif defined(OS_WIN) 8 #elif defined(OS_WIN)
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 RunLoadTest(FILE_PATH_LITERAL("manifest/relative_manifest.html")); 211 RunLoadTest(FILE_PATH_LITERAL("manifest/relative_manifest.html"));
212 } 212 }
213 213
214 // Test with the NaCl debug flag turned on. 214 // Test with the NaCl debug flag turned on.
215 class NaClBrowserTestPnaclDebug : public NaClBrowserTestPnacl { 215 class NaClBrowserTestPnaclDebug : public NaClBrowserTestPnacl {
216 public: 216 public:
217 virtual void SetUpCommandLine(CommandLine* command_line) override { 217 virtual void SetUpCommandLine(CommandLine* command_line) override {
218 NaClBrowserTestPnacl::SetUpCommandLine(command_line); 218 NaClBrowserTestPnacl::SetUpCommandLine(command_line);
219 // Turn on debugging to influence the PNaCl URL loaded 219 // Turn on debugging to influence the PNaCl URL loaded
220 command_line->AppendSwitch(switches::kEnableNaClDebug); 220 command_line->AppendSwitch(switches::kEnableNaClDebug);
221 // On windows, the debug stub requires --no-sandbox: 221 // The debug stub requires --no-sandbox:
222 // crbug.com/265624 222 // Windows bug: crbug.com/265624
223 #if defined(OS_WIN)
224 command_line->AppendSwitch(switches::kNoSandbox); 223 command_line->AppendSwitch(switches::kNoSandbox);
225 #endif
226 } 224 }
227 225
228 // On some platforms this test does not work. 226 // On some platforms this test does not work.
229 bool TestIsBroken() { 227 bool TestIsBroken() {
230 // TODO(jvoung): Make this test work on Windows 32-bit. When --no-sandbox 228 // TODO(jvoung): Make this test work on Windows 32-bit. When --no-sandbox
231 // is used, the required 1GB sandbox address space is not reserved. 229 // is used, the required 1GB sandbox address space is not reserved.
232 // (see note in chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc) 230 // (see note in chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc)
233 #if defined(OS_WIN) 231 #if defined(OS_WIN)
234 if (base::win::OSInfo::GetInstance()->wow64_status() == 232 if (base::win::OSInfo::GetInstance()->wow64_status() ==
235 base::win::OSInfo::WOW64_DISABLED && 233 base::win::OSInfo::WOW64_DISABLED &&
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 } 359 }
362 360
363 // TODO(ncbray) support glibc and PNaCl 361 // TODO(ncbray) support glibc and PNaCl
364 // flaky: crbug.com/375894 362 // flaky: crbug.com/375894
365 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { 363 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) {
366 RunNaClIntegrationTest(FILE_PATH_LITERAL( 364 RunNaClIntegrationTest(FILE_PATH_LITERAL(
367 "ppapi_extension_mime_handler.html")); 365 "ppapi_extension_mime_handler.html"));
368 } 366 }
369 367
370 } // namespace 368 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698