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

Side by Side Diff: content/browser/child_process_launcher.cc

Issue 227533008: Enable clean child process exit in sanitizer builds on ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix syntax Created 5 years, 10 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 | « no previous file | content/child/child_thread_impl.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/child_process_launcher.h" 5 #include "content/browser/child_process_launcher.h"
6 6
7 #include <utility> // For std::pair. 7 #include <utility> // For std::pair.
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 ChildProcessLauncher::Context::Context() 157 ChildProcessLauncher::Context::Context()
158 : client_(NULL), 158 : client_(NULL),
159 client_thread_id_(BrowserThread::UI), 159 client_thread_id_(BrowserThread::UI),
160 termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), 160 termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
161 exit_code_(RESULT_CODE_NORMAL_EXIT), 161 exit_code_(RESULT_CODE_NORMAL_EXIT),
162 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) 162 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
163 zygote_(false), 163 zygote_(false),
164 #endif 164 #endif
165 starting_(true), 165 starting_(true),
166 // TODO(earthdok): Re-enable on CrOS http://crbug.com/360622 166 #if defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) || \
167 #if (defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) || \ 167 defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER) || \
168 defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER) || \ 168 defined(UNDEFINED_SANITIZER)
169 defined(UNDEFINED_SANITIZER)) && !defined(OS_CHROMEOS)
170 terminate_child_on_shutdown_(false) { 169 terminate_child_on_shutdown_(false) {
171 #else 170 #else
172 terminate_child_on_shutdown_(true) { 171 terminate_child_on_shutdown_(true) {
173 #endif 172 #endif
174 } 173 }
175 174
176 void ChildProcessLauncher::Context::Launch( 175 void ChildProcessLauncher::Context::Launch(
177 SandboxedProcessLauncherDelegate* delegate, 176 SandboxedProcessLauncherDelegate* delegate,
178 base::CommandLine* cmd_line, 177 base::CommandLine* cmd_line,
179 int child_process_id, 178 int child_process_id,
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 context_->SetProcessBackgrounded(background); 603 context_->SetProcessBackgrounded(background);
605 } 604 }
606 605
607 void ChildProcessLauncher::SetTerminateChildOnShutdown( 606 void ChildProcessLauncher::SetTerminateChildOnShutdown(
608 bool terminate_on_shutdown) { 607 bool terminate_on_shutdown) {
609 if (context_.get()) 608 if (context_.get())
610 context_->set_terminate_child_on_shutdown(terminate_on_shutdown); 609 context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
611 } 610 }
612 611
613 } // namespace content 612 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/child/child_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698