| Index: content/common/sandbox_win.cc
|
| diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc
|
| index 69b379593d1b60e13f67c0bfbf0e81cb370dde14..806562180c4864ec21980b3e020361e3f06dd01d 100644
|
| --- a/content/common/sandbox_win.cc
|
| +++ b/content/common/sandbox_win.cc
|
| @@ -243,7 +243,7 @@ base::string16 PrependWindowsSessionPath(const base::char16* object) {
|
| }
|
|
|
| // Checks if the sandbox should be let to run without a job object assigned.
|
| -bool ShouldSetJobLevel(const CommandLine& cmd_line) {
|
| +bool ShouldSetJobLevel(const base::CommandLine& cmd_line) {
|
| if (!cmd_line.HasSwitch(switches::kAllowNoSandboxJob))
|
| return true;
|
|
|
| @@ -379,8 +379,9 @@ bool AddPolicyForSandboxedProcess(sandbox::TargetPolicy* policy) {
|
| // Updates the command line arguments with debug-related flags. If debug flags
|
| // have been used with this process, they will be filtered and added to
|
| // command_line as needed.
|
| -void ProcessDebugFlags(CommandLine* command_line) {
|
| - const CommandLine& current_cmd_line = *CommandLine::ForCurrentProcess();
|
| +void ProcessDebugFlags(base::CommandLine* command_line) {
|
| + const base::CommandLine& current_cmd_line =
|
| + *base::CommandLine::ForCurrentProcess();
|
| std::string type = command_line->GetSwitchValueASCII(switches::kProcessType);
|
| if (current_cmd_line.HasSwitch(switches::kWaitForDebuggerChildren)) {
|
| // Look to pass-on the kWaitForDebugger flag.
|
| @@ -500,7 +501,7 @@ BOOL WINAPI DuplicateHandlePatch(HANDLE source_process_handle,
|
|
|
| } // namespace
|
|
|
| -void SetJobLevel(const CommandLine& cmd_line,
|
| +void SetJobLevel(const base::CommandLine& cmd_line,
|
| sandbox::JobLevel job_level,
|
| uint32 ui_exceptions,
|
| sandbox::TargetPolicy* policy) {
|
| @@ -586,7 +587,8 @@ bool ShouldUseDirectWrite() {
|
| }
|
|
|
| // If forced off, don't use it.
|
| - const CommandLine& command_line = *CommandLine::ForCurrentProcess();
|
| + const base::CommandLine& command_line =
|
| + *base::CommandLine::ForCurrentProcess();
|
| if (command_line.HasSwitch(switches::kDisableDirectWrite))
|
| return false;
|
|
|
| @@ -604,8 +606,9 @@ bool ShouldUseDirectWrite() {
|
|
|
| base::ProcessHandle StartSandboxedProcess(
|
| SandboxedProcessLauncherDelegate* delegate,
|
| - CommandLine* cmd_line) {
|
| - const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
|
| + base::CommandLine* cmd_line) {
|
| + const base::CommandLine& browser_command_line =
|
| + *base::CommandLine::ForCurrentProcess();
|
| std::string type_str = cmd_line->GetSwitchValueASCII(switches::kProcessType);
|
|
|
| TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess", 0, type_str);
|
|
|