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

Side by Side Diff: chrome/nacl/nacl_main_platform_delegate_win.cc

Issue 7386002: Rename CommandLine::GetCommandLineString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. Created 9 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/nacl/nacl_main.cc ('k') | chrome/service/service_main.cc » ('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 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/native_library.h" 10 #include "base/native_library.h"
(...skipping 13 matching lines...) Expand all
24 // Be mindful of what resources you acquire here. They can be used by 24 // Be mindful of what resources you acquire here. They can be used by
25 // malicious code if the renderer gets compromised. 25 // malicious code if the renderer gets compromised.
26 } 26 }
27 27
28 void NaClMainPlatformDelegate::PlatformUninitialize() { 28 void NaClMainPlatformDelegate::PlatformUninitialize() {
29 } 29 }
30 30
31 void NaClMainPlatformDelegate::InitSandboxTests(bool no_sandbox) { 31 void NaClMainPlatformDelegate::InitSandboxTests(bool no_sandbox) {
32 const CommandLine& command_line = parameters_.command_line_; 32 const CommandLine& command_line = parameters_.command_line_;
33 33
34 DVLOG(1) << "Started NaClLdr with " << command_line.command_line_string(); 34 DVLOG(1) << "Started NaClLdr with " << command_line.GetCommandLineString();
35 35
36 sandbox::TargetServices* target_services = 36 sandbox::TargetServices* target_services =
37 parameters_.sandbox_info_.TargetServices(); 37 parameters_.sandbox_info_.TargetServices();
38 38
39 if (target_services && !no_sandbox) { 39 if (target_services && !no_sandbox) {
40 FilePath test_dll_name = 40 FilePath test_dll_name =
41 command_line.GetSwitchValuePath(switches::kTestNaClSandbox); 41 command_line.GetSwitchValuePath(switches::kTestNaClSandbox);
42 if (!test_dll_name.empty()) { 42 if (!test_dll_name.empty()) {
43 // At this point, hack on the suffix according to with bitness 43 // At this point, hack on the suffix according to with bitness
44 // of your windows process. 44 // of your windows process.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 result = (*run_security_tests)(); 83 result = (*run_security_tests)();
84 } else { 84 } else {
85 VLOG(1) << "Failed to get NaCl sandbox test function"; 85 VLOG(1) << "Failed to get NaCl sandbox test function";
86 result = false; 86 result = false;
87 } 87 }
88 base::UnloadNativeLibrary(sandbox_test_module_); 88 base::UnloadNativeLibrary(sandbox_test_module_);
89 sandbox_test_module_ = NULL; 89 sandbox_test_module_ = NULL;
90 } 90 }
91 return result; 91 return result;
92 } 92 }
OLDNEW
« no previous file with comments | « chrome/nacl/nacl_main.cc ('k') | chrome/service/service_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698