| Index: chrome/nacl/nacl_main_platform_delegate_mac.mm
|
| diff --git a/chrome/nacl/nacl_main_platform_delegate_mac.mm b/chrome/nacl/nacl_main_platform_delegate_mac.mm
|
| deleted file mode 100644
|
| index 37abc28358be46f76d5d50690c9bc17ef2eaf911..0000000000000000000000000000000000000000
|
| --- a/chrome/nacl/nacl_main_platform_delegate_mac.mm
|
| +++ /dev/null
|
| @@ -1,82 +0,0 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "chrome/nacl/nacl_main_platform_delegate.h"
|
| -
|
| -#import <Cocoa/Cocoa.h>
|
| -#include "base/command_line.h"
|
| -#include "base/files/file_path.h"
|
| -#include "base/logging.h"
|
| -#include "base/native_library.h"
|
| -#include "components/nacl/common/nacl_sandbox_type_mac.h"
|
| -#include "components/nacl/common/nacl_switches.h"
|
| -#include "content/public/common/sandbox_init.h"
|
| -
|
| -NaClMainPlatformDelegate::NaClMainPlatformDelegate(
|
| - const content::MainFunctionParams& parameters)
|
| - : parameters_(parameters), sandbox_test_module_(NULL) {
|
| -}
|
| -
|
| -NaClMainPlatformDelegate::~NaClMainPlatformDelegate() {
|
| -}
|
| -
|
| -// TODO(jvoung): see if this old comment (from renderer_main_platform...)
|
| -// is relevant to the nacl loader.
|
| -// TODO(mac-port): Any code needed to initialize a process for purposes of
|
| -// running a NaClLoader needs to also be reflected in chrome_main.cc for
|
| -// --single-process support.
|
| -void NaClMainPlatformDelegate::PlatformInitialize() {
|
| -}
|
| -
|
| -void NaClMainPlatformDelegate::PlatformUninitialize() {
|
| -}
|
| -
|
| -void NaClMainPlatformDelegate::InitSandboxTests(bool no_sandbox) {
|
| - const CommandLine& command_line = parameters_.command_line;
|
| -
|
| - DVLOG(1) << "Started NaClLdr with ";
|
| - const std::vector<std::string>& argstrings = command_line.argv();
|
| - for (std::vector<std::string>::const_iterator ii = argstrings.begin();
|
| - ii != argstrings.end(); ++ii)
|
| - DVLOG(1) << *ii;
|
| -
|
| - // Be sure not to load the sandbox test DLL if the sandbox isn't on.
|
| - // Comment-out guard and recompile if you REALLY want to test w/out the SB.
|
| - // TODO(jvoung): allow testing without sandbox, but change expected ret vals.
|
| - if (!no_sandbox) {
|
| - base::FilePath test_dll_name =
|
| - command_line.GetSwitchValuePath(switches::kTestNaClSandbox);
|
| - if (!test_dll_name.empty()) {
|
| - sandbox_test_module_ = base::LoadNativeLibrary(test_dll_name, NULL);
|
| - CHECK(sandbox_test_module_);
|
| - }
|
| - }
|
| -}
|
| -
|
| -void NaClMainPlatformDelegate::EnableSandbox() {
|
| - CHECK(content::InitializeSandbox(NACL_SANDBOX_TYPE_NACL_LOADER,
|
| - base::FilePath()))
|
| - << "Error initializing sandbox for " << switches::kNaClLoaderProcess;
|
| -}
|
| -
|
| -bool NaClMainPlatformDelegate::RunSandboxTests() {
|
| - // TODO(jvoung): Win and mac should share this identical code.
|
| - bool result = true;
|
| - if (sandbox_test_module_) {
|
| - RunNaClLoaderTests run_security_tests =
|
| - reinterpret_cast<RunNaClLoaderTests>(
|
| - base::GetFunctionPointerFromNativeLibrary(sandbox_test_module_,
|
| - kNaClLoaderTestCall));
|
| - if (run_security_tests) {
|
| - DVLOG(1) << "Running NaCl Loader security tests";
|
| - result = (*run_security_tests)();
|
| - } else {
|
| - VLOG(1) << "Failed to get NaCl sandbox test function";
|
| - result = false;
|
| - }
|
| - base::UnloadNativeLibrary(sandbox_test_module_);
|
| - sandbox_test_module_ = NULL;
|
| - }
|
| - return result;
|
| -}
|
|
|