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

Side by Side Diff: content/public/common/content_switches.cc

Issue 343543002: Increase the child process connection timeout for browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « content/public/common/content_switches.h ('k') | content/public/test/browser_test_base.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/public/common/content_switches.h" 5 #include "content/public/common/content_switches.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 8
9 namespace switches { 9 namespace switches {
10 10
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 // Causes the browser process to throw an assertion on startup. 56 // Causes the browser process to throw an assertion on startup.
57 const char kBrowserAssertTest[] = "assert-test"; 57 const char kBrowserAssertTest[] = "assert-test";
58 58
59 // Causes the browser process to crash on startup. 59 // Causes the browser process to crash on startup.
60 const char kBrowserCrashTest[] = "crash-test"; 60 const char kBrowserCrashTest[] = "crash-test";
61 61
62 // Path to the exe to run for the renderer and plugin subprocesses. 62 // Path to the exe to run for the renderer and plugin subprocesses.
63 const char kBrowserSubprocessPath[] = "browser-subprocess-path"; 63 const char kBrowserSubprocessPath[] = "browser-subprocess-path";
64 64
65 // Overrides the timeout, in seconds, that a child process waits for a
66 // connection from the browser before killing itself.
67 const char kConnectionTimeout[] = "connection-timeout";
Paweł Hajdan Jr. 2014/06/19 18:49:10 Isn't the name a bit too vague? How about child-pr
jam 2014/06/20 06:45:32 Done, changed to ipc-connection-timeout
68
65 // Dumps extra logging about plugin loading to the log file. 69 // Dumps extra logging about plugin loading to the log file.
66 const char kDebugPluginLoading[] = "debug-plugin-loading"; 70 const char kDebugPluginLoading[] = "debug-plugin-loading";
67 71
68 // Sets the tile size used by composited layers. 72 // Sets the tile size used by composited layers.
69 const char kDefaultTileWidth[] = "default-tile-width"; 73 const char kDefaultTileWidth[] = "default-tile-width";
70 const char kDefaultTileHeight[] = "default-tile-height"; 74 const char kDefaultTileHeight[] = "default-tile-height";
71 75
72 // Disable antialiasing on 2d canvas. 76 // Disable antialiasing on 2d canvas.
73 const char kDisable2dCanvasAntialiasing[] = "disable-canvas-aa"; 77 const char kDisable2dCanvasAntialiasing[] = "disable-canvas-aa";
74 78
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after
972 // Enable the Win32K process mitigation policy for renderer processes which 976 // Enable the Win32K process mitigation policy for renderer processes which
973 // prevents them from invoking user32 and gdi32 system calls which enter 977 // prevents them from invoking user32 and gdi32 system calls which enter
974 // the kernel. This is only supported on Windows 8 and beyond. 978 // the kernel. This is only supported on Windows 8 and beyond.
975 const char kEnableWin32kRendererLockDown[] 979 const char kEnableWin32kRendererLockDown[]
976 = "enable_win32k_renderer_lockdown"; 980 = "enable_win32k_renderer_lockdown";
977 #endif 981 #endif
978 982
979 // Don't dump stuff here, follow the same order as the header. 983 // Don't dump stuff here, follow the same order as the header.
980 984
981 } // namespace switches 985 } // namespace switches
OLDNEW
« no previous file with comments | « content/public/common/content_switches.h ('k') | content/public/test/browser_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698