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 da1c2b50f824061fe8431b3c1b5a96837cdfd4df..b6589e6fa343cb7f88d86d7738f31c7c62d76c6a 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -115,7 +115,9 @@ |
#include "content/public/browser/power_save_blocker.h" |
#include "content/public/common/main_function_params.h" |
#include "media/audio/sounds/sounds_manager.h" |
+#include "media/base/media.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" |
@@ -298,6 +300,13 @@ 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(); |
+ |
+ // Ensures runtime specific CPU features are initialized. |
+ media::InitializeCPUSpecificMediaFeatures(); |
Wez
2014/10/17 17:57:59
Is this also required only for the RA host?
Is it
kelvinp
2014/10/20 00:21:16
Done.
|
+ |
ChromeBrowserMainPartsLinux::PostMainMessageLoopStart(); |
} |