Fix crash initialising ChromotingHostContext in plugin.

BUG=123940
TEST=Manual

Review URL: https://chromiumcodereview.appspot.com/10116039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132877 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 2 deletions

diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc
index d693b55..57571a9 100644
--- a/remoting/host/chromoting_host_context.cc
+++ b/remoting/host/chromoting_host_context.cc
@@ -37,8 +37,13 @@ bool ChromotingHostContext::Start() {
   if (!started)
     return false;
 
-  url_request_context_getter_ = new URLRequestContextGetter(
-      io_thread_.message_loop(), file_thread_.message_loop());
+  // net::ProxyService::CreateSystemProxyConfigService requires a UI thread.
+  // TODO(jamiewalch): Clean up this dependency.
+  MessageLoop* loop = MessageLoop::current();
+  if (loop && loop->type() == MessageLoop::TYPE_UI) {
+    url_request_context_getter_ = new URLRequestContextGetter(
+        io_thread_.message_loop(), file_thread_.message_loop());
+  }
   return true;
 }
 
@@ -76,6 +81,7 @@ base::MessageLoopProxy* ChromotingHostContext::file_message_loop() {
 
 const scoped_refptr<URLRequestContextGetter>&
 ChromotingHostContext::url_request_context_getter() {
+  DCHECK(url_request_context_getter_.get());
   return url_request_context_getter_;
 }