diff options
| author | dcheng <dcheng@chromium.org> | 2014-08-28 09:57:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-28 16:58:42 +0000 |
| commit | 43890436b2626f803ddbdacc70f29929fbd89ae2 (patch) | |
| tree | 789bcd8ca96a1f0fb6cf41ed64fa008eaddf538c /mojo | |
| parent | 9e8fa203c7856353cf342f9394298e4e49735dcc (diff) | |
| download | chromium_src-43890436b2626f803ddbdacc70f29929fbd89ae2.zip chromium_src-43890436b2626f803ddbdacc70f29929fbd89ae2.tar.gz chromium_src-43890436b2626f803ddbdacc70f29929fbd89ae2.tar.bz2 | |
Manual fixups for scoped_refptr conversion operator cleanup in mojo/
BUG=110610
Review URL: https://codereview.chromium.org/512063003
Cr-Commit-Position: refs/heads/master@{#292403}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/shell/task_runners.cc | 3 | ||||
| -rw-r--r-- | mojo/shell/task_runners.h | 5 | ||||
| -rw-r--r-- | mojo/spy/spy.cc | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/mojo/shell/task_runners.cc b/mojo/shell/task_runners.cc index c0e52e9..cb157ee 100644 --- a/mojo/shell/task_runners.cc +++ b/mojo/shell/task_runners.cc @@ -23,7 +23,8 @@ scoped_ptr<base::Thread> CreateIOThread(const char* name) { } // namespace -TaskRunners::TaskRunners(base::SingleThreadTaskRunner* shell_runner) +TaskRunners::TaskRunners( + const scoped_refptr<base::SingleThreadTaskRunner>& shell_runner) : shell_runner_(shell_runner), io_thread_(CreateIOThread("io_thread")), blocking_pool_(new base::SequencedWorkerPool(kMaxBlockingPoolThreads, diff --git a/mojo/shell/task_runners.h b/mojo/shell/task_runners.h index c2f1be0..d5a0cec 100644 --- a/mojo/shell/task_runners.h +++ b/mojo/shell/task_runners.h @@ -22,7 +22,8 @@ namespace shell { // process. class TaskRunners { public: - explicit TaskRunners(base::SingleThreadTaskRunner* shell_runner); + explicit TaskRunners( + const scoped_refptr<base::SingleThreadTaskRunner>& shell_runner); ~TaskRunners(); base::SingleThreadTaskRunner* shell_runner() const { @@ -30,7 +31,7 @@ class TaskRunners { } base::SingleThreadTaskRunner* io_runner() const { - return io_thread_->message_loop_proxy(); + return io_thread_->message_loop_proxy().get(); } base::SequencedWorkerPool* blocking_pool() const { diff --git a/mojo/spy/spy.cc b/mojo/spy/spy.cc index eb7fa35..8de8229 100644 --- a/mojo/spy/spy.cc +++ b/mojo/spy/spy.cc @@ -224,12 +224,12 @@ class MessageProcessor : // In charge of intercepting access to the service manager. class SpyInterceptor : public mojo::ApplicationManager::Interceptor { public: - explicit SpyInterceptor(scoped_refptr<mojo::SpyServerImpl> spy_server, - base::MessageLoopProxy* control_loop_proxy) + explicit SpyInterceptor( + scoped_refptr<mojo::SpyServerImpl> spy_server, + const scoped_refptr<base::MessageLoopProxy>& control_loop_proxy) : spy_server_(spy_server), proxy_(base::MessageLoopProxy::current()), - control_loop_proxy_(control_loop_proxy){ - } + control_loop_proxy_(control_loop_proxy) {} private: virtual mojo::ServiceProviderPtr OnConnectToClient( |