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

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

Issue 343543002: Increase the child process connection timeout for browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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/browser/renderer_host/render_process_host_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/browser_child_process_host_impl.h" 5 #include "content/browser/browser_child_process_host_impl.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 CommandLine* cmd_line) { 133 CommandLine* cmd_line) {
134 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 134 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
135 135
136 GetContentClient()->browser()->AppendExtraCommandLineSwitches( 136 GetContentClient()->browser()->AppendExtraCommandLineSwitches(
137 cmd_line, data_.id); 137 cmd_line, data_.id);
138 138
139 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); 139 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
140 static const char* kForwardSwitches[] = { 140 static const char* kForwardSwitches[] = {
141 switches::kDisableLogging, 141 switches::kDisableLogging,
142 switches::kEnableLogging, 142 switches::kEnableLogging,
143 switches::kIPCConnectionTimeout,
143 switches::kLoggingLevel, 144 switches::kLoggingLevel,
144 switches::kTraceToConsole, 145 switches::kTraceToConsole,
145 switches::kV, 146 switches::kV,
146 switches::kVModule, 147 switches::kVModule,
147 #if defined(OS_WIN) 148 #if defined(OS_WIN)
148 switches::kEnableHighResolutionTime, 149 switches::kEnableHighResolutionTime,
149 #endif 150 #endif
150 }; 151 };
151 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, 152 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches,
152 arraysize(kForwardSwitches)); 153 arraysize(kForwardSwitches));
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 359
359 void BrowserChildProcessHostImpl::OnProcessExitedEarly( 360 void BrowserChildProcessHostImpl::OnProcessExitedEarly(
360 base::WaitableEvent* event) { 361 base::WaitableEvent* event) {
361 DeleteProcessWaitableEvent(event); 362 DeleteProcessWaitableEvent(event);
362 OnChildDisconnected(); 363 OnChildDisconnected();
363 } 364 }
364 365
365 #endif 366 #endif
366 367
367 } // namespace content 368 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698