Merge 62364 - Add --no-labs switch.

This disables all enabled labs, but doesn't disable about:labs. If a lab crashes chrome on startup, one can temporarily start chrome with --no-labs, go to about:labs, disable the lab, and then restart chrome.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/3720002

TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/3807002

git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@62449 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 2 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 394160b..7d3f5ce 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -776,8 +776,11 @@ const char kNoFirstRun[]                    = "no-first-run";
 // Pages may still be able to generate inconsistent data from plugins.
 const char kNoJsRandomness[]                = "no-js-randomness";
 
-// Don't send HTTP-Referer headers.
-const char kNoReferrers[]                   = "no-referrers";
+// Disables all labs. Does not disable about:labs. Useful if a lab makes chrome
+// crash at startup: One can start chrome with --no-labs, disable the
+// problematic lab at about:labs and then restart chrome without this switch
+// again.
+const char kNoLabs[]                        = "no-labs";
 
 // Don't send hyperlink auditing pings
 const char kNoPings[]                       = "no-pings";
@@ -786,6 +789,9 @@ const char kNoPings[]                       = "no-pings";
 // other proxy server flags that are passed.
 const char kNoProxyServer[]                 = "no-proxy-server";
 
+// Don't send HTTP-Referer headers.
+const char kNoReferrers[]                   = "no-referrers";
+
 // Runs the renderer outside the sandbox.
 const char kNoSandbox[]                     = "no-sandbox";