Manual fixups in content/child for scoped_refptr operator T* removal.

BUG=110610

Review URL: https://codereview.chromium.org/511183002

Cr-Commit-Position: refs/heads/master@{#292533}

4 files changed, 19 insertions, 15 deletions

diff --git a/content/child/thread_safe_sender.cc b/content/child/thread_safe_sender.cc
index 44fc899..d9ecfd1 100644
--- a/content/child/thread_safe_sender.cc
+++ b/content/child/thread_safe_sender.cc
@@ -10,8 +10,9 @@
 
 namespace content {
 
-ThreadSafeSender::ThreadSafeSender(base::MessageLoopProxy* main_loop,
-                                   IPC::SyncMessageFilter* sync_filter)
+ThreadSafeSender::ThreadSafeSender(
+    const scoped_refptr<base::MessageLoopProxy>& main_loop,
+    const scoped_refptr<IPC::SyncMessageFilter>& sync_filter)
     : main_loop_(main_loop), sync_filter_(sync_filter) {
 }
 
diff --git a/content/child/thread_safe_sender.h b/content/child/thread_safe_sender.h
index 6cd5c75..330e483 100644
--- a/content/child/thread_safe_sender.h
+++ b/content/child/thread_safe_sender.h
@@ -34,8 +34,8 @@ class CONTENT_EXPORT ThreadSafeSender
   friend class WebIDBCursorImplTest;
   friend class base::RefCountedThreadSafe<ThreadSafeSender>;
 
-  ThreadSafeSender(base::MessageLoopProxy* main_loop,
-                   IPC::SyncMessageFilter* sync_filter);
+  ThreadSafeSender(const scoped_refptr<base::MessageLoopProxy>& main_loop,
+                   const scoped_refptr<IPC::SyncMessageFilter>& sync_filter);
   virtual ~ThreadSafeSender();
 
   scoped_refptr<base::MessageLoopProxy> main_loop_;
diff --git a/content/child/webmessageportchannel_impl.cc b/content/child/webmessageportchannel_impl.cc
index ec6581b..dbdc2f3 100644
--- a/content/child/webmessageportchannel_impl.cc
+++ b/content/child/webmessageportchannel_impl.cc
@@ -20,7 +20,7 @@ using blink::WebString;
 namespace content {
 
 WebMessagePortChannelImpl::WebMessagePortChannelImpl(
-    base::MessageLoopProxy* child_thread_loop)
+    const scoped_refptr<base::MessageLoopProxy>& child_thread_loop)
     : client_(NULL),
       route_id_(MSG_ROUTING_NONE),
       message_port_id_(MSG_ROUTING_NONE),
@@ -32,7 +32,7 @@ WebMessagePortChannelImpl::WebMessagePortChannelImpl(
 WebMessagePortChannelImpl::WebMessagePortChannelImpl(
     int route_id,
     int message_port_id,
-    base::MessageLoopProxy* child_thread_loop)
+    const scoped_refptr<base::MessageLoopProxy>& child_thread_loop)
     : client_(NULL),
       route_id_(route_id),
       message_port_id_(message_port_id),
@@ -61,7 +61,7 @@ WebMessagePortChannelImpl::~WebMessagePortChannelImpl() {
 
 // static
 void WebMessagePortChannelImpl::CreatePair(
-    base::MessageLoopProxy* child_thread_loop,
+    const scoped_refptr<base::MessageLoopProxy>& child_thread_loop,
     blink::WebMessagePortChannel** channel1,
     blink::WebMessagePortChannel** channel2) {
   WebMessagePortChannelImpl* impl1 =
diff --git a/content/child/webmessageportchannel_impl.h b/content/child/webmessageportchannel_impl.h
index 01cd927..d66c7c6 100644
--- a/content/child/webmessageportchannel_impl.h
+++ b/content/child/webmessageportchannel_impl.h
@@ -28,14 +28,17 @@ class WebMessagePortChannelImpl
       public IPC::Listener,
       public base::RefCountedThreadSafe<WebMessagePortChannelImpl> {
  public:
-  explicit WebMessagePortChannelImpl(base::MessageLoopProxy* child_thread_loop);
-  WebMessagePortChannelImpl(int route_id,
-                            int message_port_id,
-                            base::MessageLoopProxy* child_thread_loop);
-
-  static void CreatePair(base::MessageLoopProxy* child_thread_loop,
-                         blink::WebMessagePortChannel** channel1,
-                         blink::WebMessagePortChannel** channel2);
+  explicit WebMessagePortChannelImpl(
+      const scoped_refptr<base::MessageLoopProxy>& child_thread_loop);
+  WebMessagePortChannelImpl(
+      int route_id,
+      int message_port_id,
+      const scoped_refptr<base::MessageLoopProxy>& child_thread_loop);
+
+  static void CreatePair(
+      const scoped_refptr<base::MessageLoopProxy>& child_thread_loop,
+      blink::WebMessagePortChannel** channel1,
+      blink::WebMessagePortChannel** channel2);
 
   // Extracts port IDs for passing on to the browser process, and queues any
   // received messages. Takes ownership of the passed array (and deletes it).