| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/nacl/nacl_main_platform_delegate.h" | 5 #include "chrome/nacl/nacl_main_platform_delegate.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 #include <dlfcn.h> | 8 #include <dlfcn.h> |
| 9 #import "base/chrome_application_mac.h" | 9 #import "base/chrome_application_mac.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/logging.h" |
| 11 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 12 #include "chrome/common/sandbox_mac.h" | 13 #include "chrome/common/sandbox_mac.h" |
| 13 #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h" | 14 #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h" |
| 14 | 15 |
| 15 NaClMainPlatformDelegate::NaClMainPlatformDelegate( | 16 NaClMainPlatformDelegate::NaClMainPlatformDelegate( |
| 16 const MainFunctionParams& parameters) | 17 const MainFunctionParams& parameters) |
| 17 : parameters_(parameters), sandbox_test_module_(NULL) { | 18 : parameters_(parameters), sandbox_test_module_(NULL) { |
| 18 } | 19 } |
| 19 | 20 |
| 20 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() { | 21 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() { |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 | 77 |
| 77 CHECK(run_security_tests); | 78 CHECK(run_security_tests); |
| 78 if (run_security_tests) { | 79 if (run_security_tests) { |
| 79 DLOG(INFO) << "Running NaCl Loader security tests"; | 80 DLOG(INFO) << "Running NaCl Loader security tests"; |
| 80 CHECK((*run_security_tests)()); | 81 CHECK((*run_security_tests)()); |
| 81 } | 82 } |
| 82 dlclose(sandbox_test_module_); | 83 dlclose(sandbox_test_module_); |
| 83 } | 84 } |
| 84 } | 85 } |
| 85 | 86 |
| OLD | NEW |