diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2014-12-03 10:13:09 +0000 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@google.com> | 2014-12-09 13:48:40 +0000 |
| commit | 64a92734073d2aa3acb7fc4b0dc6ab78963012fc (patch) | |
| tree | 9ceedf2278c63531fdb14b910fe53d5fbfbf9ee8 | |
| parent | 83eff5096b2d7faaad5ebabc0a49f34aeb850acd (diff) | |
| download | chromium_org-64a92734073d2aa3acb7fc4b0dc6ab78963012fc.tar.gz | |
Update the code dealing with scoped_ptrs and scoped_refptrs in JavaBridge
Required for the main patch fixing b/18520475.
These changes are purely in the syntax -- retrieve the underlying raw pointer
directly, instead of relying on overridden operators. This is to match
the current code in M40 and trunk.
Bug: 18520475
| -rw-r--r-- | content/browser/android/java/gin_java_bridge_dispatcher_host.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc index 81f49c13e4..f4f1e20e2e 100644 --- a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc +++ b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc @@ -366,7 +366,7 @@ void GinJavaBridgeDispatcherHost::OnGetMethods( return; } scoped_refptr<GinJavaBoundObject> object(*objects_.Lookup(object_id)); - if (!object) { + if (!object.get()) { LOG(ERROR) << "WebView: Unknown object: " << object_id; IPC::WriteParam(reply_msg, std::set<std::string>()); render_frame_host->Send(reply_msg); @@ -375,7 +375,7 @@ void GinJavaBridgeDispatcherHost::OnGetMethods( DCHECK(!HasPendingReply(render_frame_host)); pending_replies_[render_frame_host] = reply_msg; base::PostTaskAndReplyWithResult( - g_background_thread.Get().message_loop()->message_loop_proxy(), + g_background_thread.Get().message_loop()->message_loop_proxy().get(), FROM_HERE, base::Bind(&GinJavaBoundObject::GetMethodNames, object), base::Bind(&GinJavaBridgeDispatcherHost::SendMethods, @@ -402,7 +402,7 @@ void GinJavaBridgeDispatcherHost::OnHasMethod( DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(render_frame_host); scoped_refptr<GinJavaBoundObject> object(*objects_.Lookup(object_id)); - if (!object) { + if (!object.get()) { LOG(ERROR) << "WebView: Unknown object: " << object_id; IPC::WriteParam(reply_msg, false); render_frame_host->Send(reply_msg); @@ -411,7 +411,7 @@ void GinJavaBridgeDispatcherHost::OnHasMethod( DCHECK(!HasPendingReply(render_frame_host)); pending_replies_[render_frame_host] = reply_msg; base::PostTaskAndReplyWithResult( - g_background_thread.Get().message_loop()->message_loop_proxy(), + g_background_thread.Get().message_loop()->message_loop_proxy().get(), FROM_HERE, base::Bind(&GinJavaBoundObject::HasMethod, object, method_name), base::Bind(&GinJavaBridgeDispatcherHost::SendHasMethodReply, @@ -439,7 +439,7 @@ void GinJavaBridgeDispatcherHost::OnInvokeMethod( DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(render_frame_host); scoped_refptr<GinJavaBoundObject> object(*objects_.Lookup(object_id)); - if (!object) { + if (!object.get()) { LOG(ERROR) << "WebView: Unknown object: " << object_id; base::ListValue result; result.Append(base::Value::CreateNullValue()); |