commit 64a92734073d2aa3acb7fc4b0dc6ab78963012fc
author Mikhail Naganov <mnaganov@google.com> Wed Dec 03 10:13:09 2014 +0000
committer Mikhail Naganov <mnaganov@google.com> Tue Dec 09 13:48:40 2014 +0000
tree 9ceedf2278c63531fdb14b910fe53d5fbfbf9ee8
parent 83eff5096b2d7faaad5ebabc0a49f34aeb850acd

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

content/browser/android/java/gin_java_bridge_dispatcher_host.cc

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 81f49c1..f4f1e20 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 @@
     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 @@
   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 @@
   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 @@
   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 @@
   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());