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}

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,

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 {

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(