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

Side by Side Diff: chrome/nacl/nacl_main_platform_delegate_mac.mm

Issue 8589001: Load mac sandbox definitions from resources instead of the bundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 9 years 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/common/nacl_loader.sb ('k') | content/DEPS » ('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) 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 "chrome/nacl/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/file_path.h" 9 #include "base/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 "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
13 #include "content/common/sandbox_mac.h" 14 #include "content/common/sandbox_mac.h"
14 #include "content/public/common/sandbox_init.h" 15 #include "content/public/common/sandbox_init.h"
15 16
16 NaClMainPlatformDelegate::NaClMainPlatformDelegate( 17 NaClMainPlatformDelegate::NaClMainPlatformDelegate(
17 const content::MainFunctionParams& parameters) 18 const content::MainFunctionParams& parameters)
18 : parameters_(parameters), sandbox_test_module_(NULL) { 19 : parameters_(parameters), sandbox_test_module_(NULL) {
19 } 20 }
20 21
21 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() { 22 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() {
(...skipping 26 matching lines...) Expand all
48 FilePath test_dll_name = 49 FilePath test_dll_name =
49 command_line.GetSwitchValuePath(switches::kTestNaClSandbox); 50 command_line.GetSwitchValuePath(switches::kTestNaClSandbox);
50 if (!test_dll_name.empty()) { 51 if (!test_dll_name.empty()) {
51 sandbox_test_module_ = base::LoadNativeLibrary(test_dll_name, NULL); 52 sandbox_test_module_ = base::LoadNativeLibrary(test_dll_name, NULL);
52 CHECK(sandbox_test_module_); 53 CHECK(sandbox_test_module_);
53 } 54 }
54 } 55 }
55 } 56 }
56 57
57 void NaClMainPlatformDelegate::EnableSandbox() { 58 void NaClMainPlatformDelegate::EnableSandbox() {
58 CHECK(content::InitializeSandbox()) << "Error initializing sandbox for " 59 CHECK(content::InitializeSandbox(CHROME_SANDBOX_TYPE_NACL_LOADER, FilePath()))
59 << switches::kNaClLoaderProcess; 60 << "Error initializing sandbox for " << switches::kNaClLoaderProcess;
60 } 61 }
61 62
62 bool NaClMainPlatformDelegate::RunSandboxTests() { 63 bool NaClMainPlatformDelegate::RunSandboxTests() {
63 // TODO(jvoung): Win and mac should share this identical code. 64 // TODO(jvoung): Win and mac should share this identical code.
64 bool result = true; 65 bool result = true;
65 if (sandbox_test_module_) { 66 if (sandbox_test_module_) {
66 RunNaClLoaderTests run_security_tests = 67 RunNaClLoaderTests run_security_tests =
67 reinterpret_cast<RunNaClLoaderTests>( 68 reinterpret_cast<RunNaClLoaderTests>(
68 base::GetFunctionPointerFromNativeLibrary(sandbox_test_module_, 69 base::GetFunctionPointerFromNativeLibrary(sandbox_test_module_,
69 kNaClLoaderTestCall)); 70 kNaClLoaderTestCall));
70 if (run_security_tests) { 71 if (run_security_tests) {
71 DVLOG(1) << "Running NaCl Loader security tests"; 72 DVLOG(1) << "Running NaCl Loader security tests";
72 result = (*run_security_tests)(); 73 result = (*run_security_tests)();
73 } else { 74 } else {
74 VLOG(1) << "Failed to get NaCl sandbox test function"; 75 VLOG(1) << "Failed to get NaCl sandbox test function";
75 result = false; 76 result = false;
76 } 77 }
77 base::UnloadNativeLibrary(sandbox_test_module_); 78 base::UnloadNativeLibrary(sandbox_test_module_);
78 sandbox_test_module_ = NULL; 79 sandbox_test_module_ = NULL;
79 } 80 }
80 return result; 81 return result;
81 } 82 }
OLDNEW
« no previous file with comments | « chrome/common/nacl_loader.sb ('k') | content/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698