3 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 8c218b0..4d9803c 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -65,6 +65,7 @@
 #include "net/base/cookie_monster.h"
 #include "net/base/net_module.h"
 #include "net/http/http_network_session.h"
+#include "net/http/http_network_transaction.h"
 #include "net/socket/client_socket_pool_base.h"
 
 #if defined(OS_POSIX)
@@ -670,6 +671,9 @@ int BrowserMain(const MainFunctionParams& parameters) {
         parsed_command_line.GetSwitchValueASCII(switches::kFixedHttpsPort)));
   }
 
+  if (parsed_command_line.HasSwitch(switches::kIgnoreCertificateErrors))
+    net::HttpNetworkTransaction::IgnoreCertificateErrors(true);
+
   // Initialize histogram statistics gathering system.
   StatisticsRecorder statistics;
 
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index feb90fb..5787e1c 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -693,6 +693,9 @@ const char kUseSpdy[]                       = "use-spdy";
 const char kFixedHttpPort[]                 = "testing-fixed-http-port";
 const char kFixedHttpsPort[]                = "testing-fixed-https-port";
 
+// Ignore certificate related errors.
+const char kIgnoreCertificateErrors[]       = "ignore-certificate-errors";
+
 // Use the low fragmentation heap for the CRT.
 const char kUseLowFragHeapCrt[]             = "use-lf-heap";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 9d8e28f..afebf87 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -196,6 +196,7 @@ extern const char kUninstall[];
 extern const char kUseSpdy[];
 extern const char kFixedHttpPort[];
 extern const char kFixedHttpsPort[];
+extern const char kIgnoreCertificateErrors[];
 extern const char kUseLowFragHeapCrt[];
 extern const char kUserAgent[];
 extern const char kUserDataDir[];