Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
index 47824bd1e9eaa9f0b25b1f5c46aca6856d3be93e..43c6d374656548aff89e7d208fcde91367bcdf8f 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -113,6 +113,7 @@ |
#include "content/public/common/main_function_params.h" |
#include "media/audio/sounds/sounds_manager.h" |
#include "net/base/network_change_notifier.h" |
+#include "net/socket/ssl_server_socket.h" |
#include "net/url_request/url_request.h" |
#include "net/url_request/url_request_context_getter.h" |
#include "ui/base/touch/touch_device.h" |
@@ -311,6 +312,10 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() { |
dbus_services_.reset(new internal::DBusServices(parameters())); |
+ // Enable support for SSL server sockets, which must be done while still |
+ // single-threaded. This is required for remote assistance host on Chrome OS. |
+ net::EnableSSLServerSockets(); |
+ |
ChromeBrowserMainPartsLinux::PostMainMessageLoopStart(); |
} |