Refactor video capture to new design

content/renderer/pepper/content_renderer_pepper_host_factory.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/pepper/content_renderer_pepper_host_factory.h"
 
 #include "base/logging.h"
 #include "content/renderer/pepper/pepper_file_chooser_host.h"
 #include "content/renderer/pepper/pepper_flash_host.h"
+#include "content/renderer/pepper/pepper_video_capture_host.h"
 #include "content/renderer/pepper/pepper_websocket_host.h"
 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
 #include "ppapi/host/resource_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
 using ppapi::host::ResourceHost;
 
 namespace content {
 
 ContentRendererPepperHostFactory::ContentRendererPepperHostFactory(
@@ skipping 27 matching lines @@
   // a separate switch above.
 
   // TODO(brettw) put back this dev check! This was removed to fix issue 138902
   // where the permissions for bundled Flash (but not Flash that you specify
   // on the command line, making it difficult to test) are incorrect.
   /*if (GetPermissions().HasPermission(ppapi::PERMISSION_DEV))*/ {
     switch (message.type()) {
       case PpapiHostMsg_FileChooser_Create::ID:
         return scoped_ptr<ResourceHost>(new PepperFileChooserHost(
             host_, instance, params.pp_resource()));
+      case PpapiHostMsg_VideoCapture_Create::ID: {
+        PepperVideoCaptureHost* host = new PepperVideoCaptureHost(

[yzshen1, 2012/11/06 06:51:40]

better to directly put it in a scoped_ptr so that we don't need to do manual
delete below.

Note that there is a scoped_ptr(scoped_ptr<U> other) constructor, so it doesn't
require any extra effort to convert to scoped_ptr<ResourceHost>.

[victorhsieh, 2012/11/08 09:20:18]

Turns out it's not trivial.  scoped_ptr is declared MOVE_ONLY_TYPE_FOR_CPP_03 at
the first line of the class.  I can't make it return from a scoped_ptr<MyHost>
type.  Do you have any idea?

[yzshen1, 2012/11/10 01:14:40]

Ah. Didn't know about that. Don't bother please. :)

On 2012/11/08 09:20:18, Victor Hsieh wrote:

+            host_, instance, params.pp_resource());
+        if (!host->Init()) {
+          delete host;
+          return scoped_ptr<ResourceHost>();
+        }
+        return scoped_ptr<ResourceHost>(host);
+      }
     }
   }
 
   // Resources for Flash interfaces.
   if (GetPermissions().HasPermission(ppapi::PERMISSION_FLASH)) {
     switch (message.type()) {
       case PpapiHostMsg_Flash_Create::ID:
         return scoped_ptr<ResourceHost>(new PepperFlashHost(
             host_, instance, params.pp_resource()));
     }
   }
 
   return scoped_ptr<ResourceHost>();
 }
 
 const ppapi::PpapiPermissions&
 ContentRendererPepperHostFactory::GetPermissions() const {
   return host_->GetPpapiHost()->permissions();
 }
 
 }  // namespace content