Remove ScopedVector from chrome/browser/.

chrome/browser/media/webrtc/media_capture_devices_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 "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/media/media_access_handler.h"
 #include "chrome/browser/media/webrtc/desktop_streams_registry.h"
 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
 #include "chrome/browser/media/webrtc/permission_bubble_media_access_handler.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 62 matching lines @@
 }
 
 MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
     : is_device_enumeration_disabled_(false),
       media_stream_capture_indicator_(new MediaStreamCaptureIndicator()) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #if defined(OS_CHROMEOS)
   // Wrapper around ExtensionMediaAccessHandler used in Public Sessions.
-  media_access_handlers_.push_back(new PublicSessionMediaAccessHandler());
+  media_access_handlers_.push_back(
+      base::MakeUnique<PublicSessionMediaAccessHandler>());
 #else
-  media_access_handlers_.push_back(new ExtensionMediaAccessHandler());
+  media_access_handlers_.push_back(
+      base::MakeUnique<ExtensionMediaAccessHandler>());
 #endif
-  media_access_handlers_.push_back(new DesktopCaptureAccessHandler());
+  media_access_handlers_.push_back(
+      base::MakeUnique<DesktopCaptureAccessHandler>());
 #if defined(OS_CHROMEOS)
   // Wrapper around TabCaptureAccessHandler used in Public Sessions.
-  media_access_handlers_.push_back(new PublicSessionTabCaptureAccessHandler());
+  media_access_handlers_.push_back(
+      base::MakeUnique<PublicSessionTabCaptureAccessHandler>());
 #else
-  media_access_handlers_.push_back(new TabCaptureAccessHandler());
+  media_access_handlers_.push_back(base::MakeUnique<TabCaptureAccessHandler>());
 #endif
 #endif
-  media_access_handlers_.push_back(new PermissionBubbleMediaAccessHandler());
+  media_access_handlers_.push_back(
+      base::MakeUnique<PermissionBubbleMediaAccessHandler>());
 }
 
 MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {}
 
 void MediaCaptureDevicesDispatcher::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(prefs::kDefaultAudioCaptureDevice,
                                std::string());
   registry->RegisterStringPref(prefs::kDefaultVideoCaptureDevice,
                                std::string());
@@ skipping 37 matching lines @@
   return MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices();
 }
 
 void MediaCaptureDevicesDispatcher::ProcessMediaAccessRequest(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback,
     const extensions::Extension* extension) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  for (MediaAccessHandler* handler : media_access_handlers_) {
+  for (const auto& handler : media_access_handlers_) {
     if (handler->SupportsStreamType(request.video_type, extension) ||
         handler->SupportsStreamType(request.audio_type, extension)) {
       handler->HandleRequest(web_contents, request, callback, extension);
       return;
     }
   }
   callback.Run(content::MediaStreamDevices(),
                content::MEDIA_DEVICE_NOT_SUPPORTED, nullptr);
 }
 
 bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(
     content::WebContents* web_contents,
     const GURL& security_origin,
     content::MediaStreamType type) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return CheckMediaAccessPermission(web_contents, security_origin, type,
                                     nullptr);
 }
 
 bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(
     content::WebContents* web_contents,
     const GURL& security_origin,
     content::MediaStreamType type,
     const extensions::Extension* extension) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  for (MediaAccessHandler* handler : media_access_handlers_) {
+  for (const auto& handler : media_access_handlers_) {
     if (handler->SupportsStreamType(type, extension)) {
       return handler->CheckMediaAccessPermission(web_contents, security_origin,
                                                  type, extension);
     }
   }
   return false;
 }
 
 void MediaCaptureDevicesDispatcher::GetDefaultDevicesForProfile(
     Profile* profile,
@@ skipping 150 matching lines @@
     observer.OnUpdateVideoDevices(devices);
 }
 
 void MediaCaptureDevicesDispatcher::UpdateMediaRequestStateOnUIThread(
     int render_process_id,
     int render_frame_id,
     int page_request_id,
     const GURL& security_origin,
     content::MediaStreamType stream_type,
     content::MediaRequestState state) {
-  for (MediaAccessHandler* handler : media_access_handlers_) {
+  for (const auto& handler : media_access_handlers_) {
     if (handler->SupportsStreamType(stream_type, nullptr)) {
       handler->UpdateMediaRequestState(render_process_id, render_frame_id,
                                        page_request_id, stream_type, state);
       break;
     }
   }
 
 #if defined(OS_CHROMEOS)
   if (IsOriginForCasting(security_origin) && IsVideoMediaType(stream_type)) {
     // Notify ash that casting state has changed.
@@ skipping 17 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   for (auto& observer : observers_)
     observer.OnCreatingAudioStream(render_process_id, render_frame_id);
 }
 
 bool MediaCaptureDevicesDispatcher::IsInsecureCapturingInProgress(
     int render_process_id,
     int render_frame_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  for (MediaAccessHandler* handler : media_access_handlers_) {
+  for (const auto& handler : media_access_handlers_) {
     if (handler->SupportsStreamType(content::MEDIA_DESKTOP_VIDEO_CAPTURE,
                                     nullptr) ||
         handler->SupportsStreamType(content::MEDIA_TAB_VIDEO_CAPTURE,
                                     nullptr)) {
-      if (ToCaptureAccessHandlerBase(handler)->IsInsecureCapturingInProgress(
-              render_process_id, render_frame_id))
+      if (ToCaptureAccessHandlerBase(handler.get())
+              ->IsInsecureCapturingInProgress(render_process_id,
+                                              render_frame_id))
         return true;
     }
   }
 #endif
   return false;
 }
 
 void MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices(
     const MediaStreamDevices& devices) {
   test_audio_devices_ = devices;
@@ skipping 27 matching lines @@
     int render_frame_id,
     int page_request_id,
     content::MediaStreamType stream_type,
     bool is_secure) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (stream_type != content::MEDIA_TAB_VIDEO_CAPTURE &&
       stream_type != content::MEDIA_DESKTOP_VIDEO_CAPTURE)
     return;
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  for (MediaAccessHandler* handler : media_access_handlers_) {
+  for (const auto& handler : media_access_handlers_) {
     if (handler->SupportsStreamType(stream_type, nullptr)) {
-      ToCaptureAccessHandlerBase(handler)->UpdateCapturingLinkSecured(
-          render_process_id, render_frame_id, page_request_id, is_secure);
+      ToCaptureAccessHandlerBase(handler.get())
+          ->UpdateCapturingLinkSecured(render_process_id, render_frame_id,
+                                       page_request_id, is_secure);
       break;
     }
   }
 #endif
 }