diff options
| -rw-r--r-- | remoting/base/url_request_context.cc | 6 | ||||
| -rw-r--r-- | remoting/base/url_request_context.h | 1 | ||||
| -rw-r--r-- | remoting/client/jni/chromoting_jni_runtime.cc | 3 | ||||
| -rw-r--r-- | remoting/host/chromoting_host_context.cc | 2 | ||||
| -rw-r--r-- | remoting/host/setup/start_host.cc | 4 | ||||
| -rw-r--r-- | remoting/host/setup/win/host_configurer.cc | 3 |
6 files changed, 5 insertions, 14 deletions
diff --git a/remoting/base/url_request_context.cc b/remoting/base/url_request_context.cc index 470f1535..4e80344 100644 --- a/remoting/base/url_request_context.cc +++ b/remoting/base/url_request_context.cc @@ -43,10 +43,7 @@ class ProxyConfigServiceDirect : public net::ProxyConfigService { }; net::ProxyConfigService* CreateSystemProxyConfigService( - base::SingleThreadTaskRunner* ui_task_runner, base::SingleThreadTaskRunner* io_thread_task_runner) { - DCHECK(ui_task_runner->BelongsToCurrentThread()); - #if defined(OS_WIN) return new net::ProxyConfigServiceWin(); #elif defined(OS_MACOSX) @@ -115,11 +112,10 @@ URLRequestContext::~URLRequestContext() { } URLRequestContextGetter::URLRequestContextGetter( - scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, scoped_refptr<base::SingleThreadTaskRunner> network_task_runner) : network_task_runner_(network_task_runner) { proxy_config_service_.reset(CreateSystemProxyConfigService( - ui_task_runner.get(), network_task_runner_.get())); + network_task_runner_.get())); } net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { diff --git a/remoting/base/url_request_context.h b/remoting/base/url_request_context.h index ecdb07a6..6ce2d572 100644 --- a/remoting/base/url_request_context.h +++ b/remoting/base/url_request_context.h @@ -40,7 +40,6 @@ class URLRequestContext : public net::URLRequestContext { class URLRequestContextGetter : public net::URLRequestContextGetter { public: URLRequestContextGetter( - scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, scoped_refptr<base::SingleThreadTaskRunner> network_task_runner); // Overridden from net::URLRequestContextGetter: diff --git a/remoting/client/jni/chromoting_jni_runtime.cc b/remoting/client/jni/chromoting_jni_runtime.cc index 8d51a83..dc509b3 100644 --- a/remoting/client/jni/chromoting_jni_runtime.cc +++ b/remoting/client/jni/chromoting_jni_runtime.cc @@ -50,8 +50,7 @@ ChromotingJniRuntime::ChromotingJniRuntime() { display_task_runner_ = AutoThread::Create("native_disp", ui_task_runner_); - url_requester_ = new URLRequestContextGetter(ui_task_runner_, - network_task_runner_); + url_requester_ = new URLRequestContextGetter(network_task_runner_); // Allows later decoding of video frames. media::InitializeCPUSpecificYUVConversions(); diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc index aa3146c..350404b 100644 --- a/remoting/host/chromoting_host_context.cc +++ b/remoting/host/chromoting_host_context.cc @@ -40,7 +40,7 @@ ChromotingHostContext::ChromotingHostContext( "ChromotingEncodeThread", ui_task_runner_); url_request_context_getter_ = new URLRequestContextGetter( - ui_task_runner_, network_task_runner_); + network_task_runner_); } ChromotingHostContext::~ChromotingHostContext() { diff --git a/remoting/host/setup/start_host.cc b/remoting/host/setup/start_host.cc index 024e9a3..ab5688db 100644 --- a/remoting/host/setup/start_host.cc +++ b/remoting/host/setup/start_host.cc @@ -149,9 +149,7 @@ int main(int argc, char** argv) { io_thread.StartWithOptions(io_thread_options); scoped_refptr<net::URLRequestContextGetter> url_request_context_getter( - new remoting::URLRequestContextGetter( - g_message_loop->message_loop_proxy(), - io_thread.message_loop_proxy())); + new remoting::URLRequestContextGetter(io_thread.message_loop_proxy())); net::URLFetcher::SetIgnoreCertificateRequests(true); diff --git a/remoting/host/setup/win/host_configurer.cc b/remoting/host/setup/win/host_configurer.cc index bf5b8a6..604c9e4 100644 --- a/remoting/host/setup/win/host_configurer.cc +++ b/remoting/host/setup/win/host_configurer.cc @@ -45,8 +45,7 @@ int WINAPI WinMain(HINSTANCE instance_handle, HINSTANCE prev_instance_handle, io_thread.StartWithOptions(io_thread_options); scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_( - new remoting::URLRequestContextGetter( - message_loop.message_loop_proxy(), io_thread.message_loop_proxy())); + new remoting::URLRequestContextGetter(io_thread.message_loop_proxy())); OleInitialize(NULL); |