Update content/ to use WeakPtr<T>::get() instead of implicit "operator T*"

content/browser/browser_plugin/browser_plugin_embedder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
 
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/browser_plugin_guest_manager.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 30 matching lines @@
   return new BrowserPluginEmbedder(web_contents);
 }
 
 void BrowserPluginEmbedder::DragEnteredGuest(BrowserPluginGuest* guest) {
   guest_dragging_over_ = guest->AsWeakPtr();
 }
 
 void BrowserPluginEmbedder::DragLeftGuest(BrowserPluginGuest* guest) {
   // Avoid race conditions in switching between guests being hovered over by
   // only un-setting if the caller is marked as the guest being dragged over.
-  if (guest_dragging_over_ == guest) {
+  if (guest_dragging_over_.get() == guest) {
     guest_dragging_over_.reset();
   }
 }
 
 void BrowserPluginEmbedder::StartDrag(BrowserPluginGuest* guest) {
   guest_started_drag_ = guest->AsWeakPtr();
 }
 
 void BrowserPluginEmbedder::StopDrag(BrowserPluginGuest* guest) {
-  if (guest_started_drag_ == guest) {
+  if (guest_started_drag_.get() == guest) {
     guest_started_drag_.reset();
   }
 }
 
 void BrowserPluginEmbedder::GetRenderViewHostAtPosition(
     int x, int y, const WebContents::GetRenderViewHostCallback& callback) {
   // Store the callback so we can call it later when we have the response.
   pending_get_render_view_callbacks_.insert(
       std::make_pair(next_get_render_view_request_id_, callback));
   Send(new BrowserPluginMsg_PluginAtPositionRequest(
@@ skipping 21 matching lines @@
                         OnPluginAtPositionResponse)
     IPC_MESSAGE_HANDLER_GENERIC(DragHostMsg_UpdateDragCursor,
                                 OnUpdateDragCursor(&handled));
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void BrowserPluginEmbedder::DragSourceEndedAt(int client_x, int client_y,
     int screen_x, int screen_y, WebKit::WebDragOperation operation) {
-  if (guest_started_drag_) {
+  if (guest_started_drag_.get()) {
     gfx::Point guest_offset =
         guest_started_drag_->GetScreenCoordinates(gfx::Point());
     guest_started_drag_->DragSourceEndedAt(client_x - guest_offset.x(),
         client_y - guest_offset.y(), screen_x, screen_y, operation);
   }
 }
 
 void BrowserPluginEmbedder::DragSourceMovedTo(int client_x, int client_y,
                                               int screen_x, int screen_y) {
-  if (guest_started_drag_) {
+  if (guest_started_drag_.get()) {
     gfx::Point guest_offset =
         guest_started_drag_->GetScreenCoordinates(gfx::Point());
     guest_started_drag_->DragSourceMovedTo(client_x - guest_offset.x(),
         client_y - guest_offset.y(), screen_x, screen_y);
   }
 }
 
 void BrowserPluginEmbedder::SystemDragEnded() {
-  if (guest_started_drag_ && (guest_started_drag_ != guest_dragging_over_))
+  if (guest_started_drag_.get() &&
+      (guest_started_drag_.get() != guest_dragging_over_.get()))
     guest_started_drag_->EndSystemDrag();
   guest_started_drag_.reset();
   guest_dragging_over_.reset();
 }
 
 void BrowserPluginEmbedder::OnUpdateDragCursor(bool* handled) {
-  *handled = (guest_dragging_over_ != NULL);
+  *handled = (guest_dragging_over_.get() != NULL);
 }
 
 void BrowserPluginEmbedder::CleanUp() {
   // CleanUp gets called when BrowserPluginEmbedder's WebContents goes away
   // or the associated RenderViewHost is destroyed or swapped out. Therefore we
   // don't need to care about the pending callbacks anymore.
   pending_get_render_view_callbacks_.clear();
 }
 
 BrowserPluginGuestManager*
@@ skipping 53 matching lines @@
   if (guest)
     render_view_host = guest->GetWebContents()->GetRenderViewHost();
   else  // No plugin, use embedder's RenderViewHost.
     render_view_host = web_contents()->GetRenderViewHost();
 
   callback_iter->second.Run(render_view_host, position.x(), position.y());
   pending_get_render_view_callbacks_.erase(callback_iter);
 }
 
 }  // namespace content