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

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: 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 | « 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 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 597
598 // Ignores certificate-related errors. 598 // Ignores certificate-related errors.
599 const char kIgnoreCertificateErrors[] = "ignore-certificate-errors"; 599 const char kIgnoreCertificateErrors[] = "ignore-certificate-errors";
600 600
601 // Ignores GPU blacklist. 601 // Ignores GPU blacklist.
602 const char kIgnoreGpuBlacklist[] = "ignore-gpu-blacklist"; 602 const char kIgnoreGpuBlacklist[] = "ignore-gpu-blacklist";
603 603
604 // Run the GPU process as a thread in the browser process. 604 // Run the GPU process as a thread in the browser process.
605 const char kInProcessGPU[] = "in-process-gpu"; 605 const char kInProcessGPU[] = "in-process-gpu";
606 606
607 // Overrides the timeout, in seconds, that a child process waits for a
608 // connection from the browser before killing itself.
609 const char kIPCConnectionTimeout[] = "ipc-connection-timeout";
610
607 // Specifies the flags passed to JS engine 611 // Specifies the flags passed to JS engine
608 const char kJavaScriptFlags[] = "js-flags"; 612 const char kJavaScriptFlags[] = "js-flags";
609 613
610 // Load an NPAPI plugin from the specified path. 614 // Load an NPAPI plugin from the specified path.
611 const char kLoadPlugin[] = "load-plugin"; 615 const char kLoadPlugin[] = "load-plugin";
612 616
613 // Logs GPU control list decisions when enforcing blacklist rules. 617 // Logs GPU control list decisions when enforcing blacklist rules.
614 const char kLogGpuControlListDecisions[] = "log-gpu-control-list-decisions"; 618 const char kLogGpuControlListDecisions[] = "log-gpu-control-list-decisions";
615 619
616 // Sets the minimum log level. Valid values are from 0 to 3: 620 // Sets the minimum log level. Valid values are from 0 to 3:
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
963 // Enable the Win32K process mitigation policy for renderer processes which 967 // Enable the Win32K process mitigation policy for renderer processes which
964 // prevents them from invoking user32 and gdi32 system calls which enter 968 // prevents them from invoking user32 and gdi32 system calls which enter
965 // the kernel. This is only supported on Windows 8 and beyond. 969 // the kernel. This is only supported on Windows 8 and beyond.
966 const char kEnableWin32kRendererLockDown[] 970 const char kEnableWin32kRendererLockDown[]
967 = "enable_win32k_renderer_lockdown"; 971 = "enable_win32k_renderer_lockdown";
968 #endif 972 #endif
969 973
970 // Don't dump stuff here, follow the same order as the header. 974 // Don't dump stuff here, follow the same order as the header.
971 975
972 } // namespace switches 976 } // 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