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

content/renderer/media/media_stream_dispatcher.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/renderer/media/media_stream_dispatcher.h"
 
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
@@ skipping 146 matching lines @@
       request_id, event_handler, &video_enumeration_state_);
 }
 
 void MediaStreamDispatcher::RemoveEnumerationRequest(
     int request_id,
     const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
     EnumerationState* state) {
   EnumerationRequestList* requests = &state->requests;
   for (EnumerationRequestList::iterator it = requests->begin();
        it != requests->end(); ++it) {
-    if (it->request_id == request_id && it->handler == event_handler) {
+    if (it->request_id == request_id &&
+        it->handler.get() == event_handler.get()) {
       requests->erase(it);
       if (requests->empty() && state->cached_devices) {
         // No more request and has a label, try to stop the label
         // and invalidate the state.
         Send(new MediaStreamHostMsg_StopGeneratedStream(
             routing_id(), state->cached_devices->label));
         state->ipc_id = -1;
         state->cached_devices.reset();
       }
       return;
@@ skipping 64 matching lines @@
 
   for (RequestList::iterator it = requests_.begin();
        it != requests_.end(); ++it) {
     Request& request = *it;
     if (request.ipc_request == request_id) {
       Stream new_stream;
       new_stream.handler = request.handler;
       new_stream.audio_array = audio_array;
       new_stream.video_array = video_array;
       label_stream_map_[label] = new_stream;
-      if (request.handler) {
-        request.handler->OnStreamGenerated(request.request_id, label,
-                                           audio_array, video_array);
+      if (request.handler.get()) {
+        request.handler->OnStreamGenerated(
+            request.request_id, label, audio_array, video_array);
         DVLOG(1) << "MediaStreamDispatcher::OnStreamGenerated("
                  << request.request_id << ", " << label << ")";
       }
       requests_.erase(it);
       break;
     }
   }
 }
 
 void MediaStreamDispatcher::OnStreamGenerationFailed(int request_id) {
   DCHECK(main_loop_->BelongsToCurrentThread());
   for (RequestList::iterator it = requests_.begin();
        it != requests_.end(); ++it) {
     Request& request = *it;
     if (request.ipc_request == request_id) {
-      if (request.handler) {
+      if (request.handler.get()) {
         request.handler->OnStreamGenerationFailed(request.request_id);
         DVLOG(1) << "MediaStreamDispatcher::OnStreamGenerationFailed("
                  << request.request_id << ")\n";
       }
       requests_.erase(it);
       break;
     }
   }
 }
 
@@ skipping 17 matching lines @@
     Send(new MediaStreamHostMsg_StopGeneratedStream(routing_id(), label));
     return;
   }
 
   DCHECK(!label.empty());
   state->cached_devices.reset(new EnumerationState::CachedDevices(
       label, device_array));
 
   for (EnumerationRequestList::iterator it = state->requests.begin();
        it != state->requests.end(); ++it) {
-    if (it->handler) {
+    if (it->handler.get()) {
       it->handler->OnDevicesEnumerated(it->request_id, device_array);
       DVLOG(1) << "MediaStreamDispatcher::OnDevicesEnumerated("
                << it->request_id << ")";
     }
   }
 }
 
 void MediaStreamDispatcher::OnDevicesEnumerationFailed(int request_id) {
   DCHECK(main_loop_->BelongsToCurrentThread());
   for (RequestList::iterator it = requests_.begin();
        it != requests_.end(); ++it) {
     Request& request = *it;
     if (request.ipc_request == request_id) {
-      if (request.handler) {
+      if (request.handler.get()) {
         request.handler->OnDevicesEnumerationFailed(request.request_id);
         DVLOG(1) << "MediaStreamDispatcher::OnDevicesEnumerationFailed("
                  << request.request_id << ")\n";
       }
       requests_.erase(it);
       break;
     }
   }
 }
 
 void MediaStreamDispatcher::OnDeviceOpened(
     int request_id,
     const std::string& label,
     const StreamDeviceInfo& device_info) {
   DCHECK(main_loop_->BelongsToCurrentThread());
   for (RequestList::iterator it = requests_.begin();
        it != requests_.end(); ++it) {
     Request& request = *it;
     if (request.ipc_request == request_id) {
       Stream new_stream;
       new_stream.handler = request.handler;
       if (IsAudioMediaType(device_info.device.type)) {
         new_stream.audio_array.push_back(device_info);
       } else if (IsVideoMediaType(device_info.device.type)) {
         new_stream.video_array.push_back(device_info);
       } else {
         NOTREACHED();
       }
       label_stream_map_[label] = new_stream;
-      if (request.handler) {
-        request.handler->OnDeviceOpened(request.request_id, label,
-                                        device_info);
+      if (request.handler.get()) {
+        request.handler->OnDeviceOpened(request.request_id, label, device_info);
         DVLOG(1) << "MediaStreamDispatcher::OnDeviceOpened("
                  << request.request_id << ", " << label << ")";
       }
       requests_.erase(it);
       break;
     }
   }
 }
 
 void MediaStreamDispatcher::OnDeviceOpenFailed(int request_id) {
   DCHECK(main_loop_->BelongsToCurrentThread());
   for (RequestList::iterator it = requests_.begin();
        it != requests_.end(); ++it) {
     Request& request = *it;
     if (request.ipc_request == request_id) {
-      if (request.handler) {
+      if (request.handler.get()) {
         request.handler->OnDeviceOpenFailed(request.request_id);
         DVLOG(1) << "MediaStreamDispatcher::OnDeviceOpenFailed("
                  << request.request_id << ")\n";
       }
       requests_.erase(it);
       break;
     }
   }
 }
 
@@ skipping 15 matching lines @@
                                             int index) {
   LabelStreamMap::iterator it = label_stream_map_.find(label);
   if (it == label_stream_map_.end())
     return StreamDeviceInfo::kNoId;
 
   DCHECK_GT(it->second.video_array.size(), static_cast<size_t>(index));
   return it->second.video_array[index].session_id;
 }
 
 }  // namespace content