OLD | NEW |
1 // Copyright (c) 2011 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/nacl/nacl_main_platform_delegate.h" | 5 #include "components/nacl/loader/nacl_main_platform_delegate.h" |
6 | 6 |
7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/native_library.h" | 11 #include "base/native_library.h" |
12 #include "chrome/common/chrome_sandbox_type_mac.h" | 12 #include "components/nacl/common/nacl_sandbox_type_mac.h" |
13 #include "chrome/common/chrome_switches.h" | 13 #include "components/nacl/common/nacl_switches.h" |
14 #include "content/public/common/sandbox_init.h" | 14 #include "content/public/common/sandbox_init.h" |
15 | 15 |
16 NaClMainPlatformDelegate::NaClMainPlatformDelegate( | 16 NaClMainPlatformDelegate::NaClMainPlatformDelegate( |
17 const content::MainFunctionParams& parameters) | 17 const content::MainFunctionParams& parameters) |
18 : parameters_(parameters), sandbox_test_module_(NULL) { | 18 : parameters_(parameters), sandbox_test_module_(NULL) { |
19 } | 19 } |
20 | 20 |
21 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() { | 21 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() { |
22 } | 22 } |
23 | 23 |
(...skipping 24 matching lines...) Expand all Loading... |
48 base::FilePath test_dll_name = | 48 base::FilePath test_dll_name = |
49 command_line.GetSwitchValuePath(switches::kTestNaClSandbox); | 49 command_line.GetSwitchValuePath(switches::kTestNaClSandbox); |
50 if (!test_dll_name.empty()) { | 50 if (!test_dll_name.empty()) { |
51 sandbox_test_module_ = base::LoadNativeLibrary(test_dll_name, NULL); | 51 sandbox_test_module_ = base::LoadNativeLibrary(test_dll_name, NULL); |
52 CHECK(sandbox_test_module_); | 52 CHECK(sandbox_test_module_); |
53 } | 53 } |
54 } | 54 } |
55 } | 55 } |
56 | 56 |
57 void NaClMainPlatformDelegate::EnableSandbox() { | 57 void NaClMainPlatformDelegate::EnableSandbox() { |
58 CHECK(content::InitializeSandbox(CHROME_SANDBOX_TYPE_NACL_LOADER, | 58 CHECK(content::InitializeSandbox(NACL_SANDBOX_TYPE_NACL_LOADER, |
59 base::FilePath())) | 59 base::FilePath())) |
60 << "Error initializing sandbox for " << switches::kNaClLoaderProcess; | 60 << "Error initializing sandbox for " << switches::kNaClLoaderProcess; |
61 } | 61 } |
62 | 62 |
63 bool NaClMainPlatformDelegate::RunSandboxTests() { | 63 bool NaClMainPlatformDelegate::RunSandboxTests() { |
64 // TODO(jvoung): Win and mac should share this identical code. | 64 // TODO(jvoung): Win and mac should share this identical code. |
65 bool result = true; | 65 bool result = true; |
66 if (sandbox_test_module_) { | 66 if (sandbox_test_module_) { |
67 RunNaClLoaderTests run_security_tests = | 67 RunNaClLoaderTests run_security_tests = |
68 reinterpret_cast<RunNaClLoaderTests>( | 68 reinterpret_cast<RunNaClLoaderTests>( |
69 base::GetFunctionPointerFromNativeLibrary(sandbox_test_module_, | 69 base::GetFunctionPointerFromNativeLibrary(sandbox_test_module_, |
70 kNaClLoaderTestCall)); | 70 kNaClLoaderTestCall)); |
71 if (run_security_tests) { | 71 if (run_security_tests) { |
72 DVLOG(1) << "Running NaCl Loader security tests"; | 72 DVLOG(1) << "Running NaCl Loader security tests"; |
73 result = (*run_security_tests)(); | 73 result = (*run_security_tests)(); |
74 } else { | 74 } else { |
75 VLOG(1) << "Failed to get NaCl sandbox test function"; | 75 VLOG(1) << "Failed to get NaCl sandbox test function"; |
76 result = false; | 76 result = false; |
77 } | 77 } |
78 base::UnloadNativeLibrary(sandbox_test_module_); | 78 base::UnloadNativeLibrary(sandbox_test_module_); |
79 sandbox_test_module_ = NULL; | 79 sandbox_test_module_ = NULL; |
80 } | 80 } |
81 return result; | 81 return result; |
82 } | 82 } |
OLD | NEW |