diff options
author | skyostil <skyostil@chromium.org> | 2015-06-05 12:53:07 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 19:53:37 +0000 |
commit | 95082a6a47108c4e20a77cc224172a293065ab05 (patch) | |
tree | c34e72f82cf4742097c92a500fabd9af0f251cef /content/browser/streams | |
parent | 4e95f763c7f52664c94373b7d9fcc0ed96c7f019 (diff) | |
download | chromium_src-95082a6a47108c4e20a77cc224172a293065ab05.zip chromium_src-95082a6a47108c4e20a77cc224172a293065ab05.tar.gz chromium_src-95082a6a47108c4e20a77cc224172a293065ab05.tar.bz2 |
content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs
This patch was mostly autogenerated with
https://codereview.chromium.org/1010073002/.
BUG=465354
TBR=nick@chromium.org
Committed: https://crrev.com/422456f9d53f0bf936a64f21a1463fd0abd3df84
Cr-Commit-Position: refs/heads/master@{#333081}
Review URL: https://codereview.chromium.org/1159623009
Cr-Commit-Position: refs/heads/master@{#333112}
Diffstat (limited to 'content/browser/streams')
-rw-r--r-- | content/browser/streams/stream.cc | 13 | ||||
-rw-r--r-- | content/browser/streams/stream_handle_impl.cc | 9 | ||||
-rw-r--r-- | content/browser/streams/stream_handle_impl.h | 4 | ||||
-rw-r--r-- | content/browser/streams/stream_url_request_job.cc | 5 |
4 files changed, 17 insertions, 14 deletions
diff --git a/content/browser/streams/stream.cc b/content/browser/streams/stream.cc index fb36ad9..3f4ae680 100644 --- a/content/browser/streams/stream.cc +++ b/content/browser/streams/stream.cc @@ -6,7 +6,8 @@ #include "base/bind.h" #include "base/location.h" -#include "base/message_loop/message_loop_proxy.h" +#include "base/single_thread_task_runner.h" +#include "base/thread_task_runner_handle.h" #include "base/values.h" #include "content/browser/streams/stream_handle_impl.h" #include "content/browser/streams/stream_read_observer.h" @@ -35,11 +36,9 @@ Stream::Stream(StreamRegistry* registry, write_observer_(write_observer), stream_handle_(NULL), weak_ptr_factory_(this) { - CreateByteStream(base::MessageLoopProxy::current(), - base::MessageLoopProxy::current(), - kDeferSizeThreshold, - &writer_, - &reader_); + CreateByteStream(base::ThreadTaskRunnerHandle::Get(), + base::ThreadTaskRunnerHandle::Get(), kDeferSizeThreshold, + &writer_, &reader_); // Setup callback for writing. writer_->RegisterCallback(base::Bind(&Stream::OnSpaceAvailable, @@ -122,7 +121,7 @@ void Stream::Finalize() { writer_.reset(); // Continue asynchronously. - base::MessageLoopProxy::current()->PostTask( + base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(&Stream::OnDataAvailable, weak_ptr_factory_.GetWeakPtr())); } diff --git a/content/browser/streams/stream_handle_impl.cc b/content/browser/streams/stream_handle_impl.cc index 5bc2acb..ba4dee2 100644 --- a/content/browser/streams/stream_handle_impl.cc +++ b/content/browser/streams/stream_handle_impl.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/location.h" -#include "base/message_loop/message_loop_proxy.h" +#include "base/thread_task_runner_handle.h" #include "content/browser/streams/stream.h" namespace content { @@ -23,11 +23,12 @@ void RunCloseListeners(const std::vector<base::Closure>& close_listeners) { StreamHandleImpl::StreamHandleImpl(const base::WeakPtr<Stream>& stream) : stream_(stream), url_(stream->url()), - stream_message_loop_(base::MessageLoopProxy::current().get()) {} + stream_task_runner_(base::ThreadTaskRunnerHandle::Get().get()) { +} StreamHandleImpl::~StreamHandleImpl() { - stream_message_loop_->PostTaskAndReply(FROM_HERE, - base::Bind(&Stream::CloseHandle, stream_), + stream_task_runner_->PostTaskAndReply( + FROM_HERE, base::Bind(&Stream::CloseHandle, stream_), base::Bind(&RunCloseListeners, close_listeners_)); } diff --git a/content/browser/streams/stream_handle_impl.h b/content/browser/streams/stream_handle_impl.h index d2bd94d..15e8e20 100644 --- a/content/browser/streams/stream_handle_impl.h +++ b/content/browser/streams/stream_handle_impl.h @@ -11,7 +11,7 @@ #include "content/public/browser/stream_handle.h" namespace base { -class MessageLoopProxy; +class SingleThreadTaskRunner; } namespace content { @@ -30,7 +30,7 @@ class StreamHandleImpl : public StreamHandle { base::WeakPtr<Stream> stream_; GURL url_; - base::MessageLoopProxy* stream_message_loop_; + base::SingleThreadTaskRunner* stream_task_runner_; std::vector<base::Closure> close_listeners_; }; diff --git a/content/browser/streams/stream_url_request_job.cc b/content/browser/streams/stream_url_request_job.cc index 3d4ac7f..d2bce89 100644 --- a/content/browser/streams/stream_url_request_job.cc +++ b/content/browser/streams/stream_url_request_job.cc @@ -4,7 +4,10 @@ #include "content/browser/streams/stream_url_request_job.h" +#include "base/location.h" +#include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" +#include "base/thread_task_runner_handle.h" #include "content/browser/streams/stream.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" @@ -80,7 +83,7 @@ void StreamURLRequestJob::OnDataAvailable(Stream* stream) { // net::URLRequestJob methods. void StreamURLRequestJob::Start() { // Continue asynchronously. - base::MessageLoop::current()->PostTask( + base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(&StreamURLRequestJob::DidStart, weak_factory_.GetWeakPtr())); } |