Commit 20c1d183 authored by dcheng's avatar dcheng Committed by Commit bot

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}
parent 7b723d5c
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
namespace content { namespace content {
ThreadSafeSender::ThreadSafeSender(base::MessageLoopProxy* main_loop, ThreadSafeSender::ThreadSafeSender(
IPC::SyncMessageFilter* sync_filter) const scoped_refptr<base::MessageLoopProxy>& main_loop,
const scoped_refptr<IPC::SyncMessageFilter>& sync_filter)
: main_loop_(main_loop), sync_filter_(sync_filter) { : main_loop_(main_loop), sync_filter_(sync_filter) {
} }
......
...@@ -34,8 +34,8 @@ class CONTENT_EXPORT ThreadSafeSender ...@@ -34,8 +34,8 @@ class CONTENT_EXPORT ThreadSafeSender
friend class WebIDBCursorImplTest; friend class WebIDBCursorImplTest;
friend class base::RefCountedThreadSafe<ThreadSafeSender>; friend class base::RefCountedThreadSafe<ThreadSafeSender>;
ThreadSafeSender(base::MessageLoopProxy* main_loop, ThreadSafeSender(const scoped_refptr<base::MessageLoopProxy>& main_loop,
IPC::SyncMessageFilter* sync_filter); const scoped_refptr<IPC::SyncMessageFilter>& sync_filter);
virtual ~ThreadSafeSender(); virtual ~ThreadSafeSender();
scoped_refptr<base::MessageLoopProxy> main_loop_; scoped_refptr<base::MessageLoopProxy> main_loop_;
......
...@@ -20,7 +20,7 @@ using blink::WebString; ...@@ -20,7 +20,7 @@ using blink::WebString;
namespace content { namespace content {
WebMessagePortChannelImpl::WebMessagePortChannelImpl( WebMessagePortChannelImpl::WebMessagePortChannelImpl(
base::MessageLoopProxy* child_thread_loop) const scoped_refptr<base::MessageLoopProxy>& child_thread_loop)
: client_(NULL), : client_(NULL),
route_id_(MSG_ROUTING_NONE), route_id_(MSG_ROUTING_NONE),
message_port_id_(MSG_ROUTING_NONE), message_port_id_(MSG_ROUTING_NONE),
...@@ -32,7 +32,7 @@ WebMessagePortChannelImpl::WebMessagePortChannelImpl( ...@@ -32,7 +32,7 @@ WebMessagePortChannelImpl::WebMessagePortChannelImpl(
WebMessagePortChannelImpl::WebMessagePortChannelImpl( WebMessagePortChannelImpl::WebMessagePortChannelImpl(
int route_id, int route_id,
int message_port_id, int message_port_id,
base::MessageLoopProxy* child_thread_loop) const scoped_refptr<base::MessageLoopProxy>& child_thread_loop)
: client_(NULL), : client_(NULL),
route_id_(route_id), route_id_(route_id),
message_port_id_(message_port_id), message_port_id_(message_port_id),
...@@ -61,7 +61,7 @@ WebMessagePortChannelImpl::~WebMessagePortChannelImpl() { ...@@ -61,7 +61,7 @@ WebMessagePortChannelImpl::~WebMessagePortChannelImpl() {
// static // static
void WebMessagePortChannelImpl::CreatePair( void WebMessagePortChannelImpl::CreatePair(
base::MessageLoopProxy* child_thread_loop, const scoped_refptr<base::MessageLoopProxy>& child_thread_loop,
blink::WebMessagePortChannel** channel1, blink::WebMessagePortChannel** channel1,
blink::WebMessagePortChannel** channel2) { blink::WebMessagePortChannel** channel2) {
WebMessagePortChannelImpl* impl1 = WebMessagePortChannelImpl* impl1 =
......
...@@ -28,14 +28,17 @@ class WebMessagePortChannelImpl ...@@ -28,14 +28,17 @@ class WebMessagePortChannelImpl
public IPC::Listener, public IPC::Listener,
public base::RefCountedThreadSafe<WebMessagePortChannelImpl> { public base::RefCountedThreadSafe<WebMessagePortChannelImpl> {
public: public:
explicit WebMessagePortChannelImpl(base::MessageLoopProxy* child_thread_loop); explicit WebMessagePortChannelImpl(
WebMessagePortChannelImpl(int route_id, const scoped_refptr<base::MessageLoopProxy>& child_thread_loop);
int message_port_id, WebMessagePortChannelImpl(
base::MessageLoopProxy* child_thread_loop); int route_id,
int message_port_id,
static void CreatePair(base::MessageLoopProxy* child_thread_loop, const scoped_refptr<base::MessageLoopProxy>& child_thread_loop);
blink::WebMessagePortChannel** channel1,
blink::WebMessagePortChannel** channel2); 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 // Extracts port IDs for passing on to the browser process, and queues any
// received messages. Takes ownership of the passed array (and deletes it). // received messages. Takes ownership of the passed array (and deletes it).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment