Fix the build with enable_webrtc=0 after r281588.

Fix the build with enable_webrtc=0 after r281588.

CanUseCompositorAPI() and CanUseVideoDecodeAPI() were defined only if WebRTC support was enabled, even though they do not depend on it.
    
Make the ENABLE_WEBRTC ifdef cover only CanUseMediaStreamAPI() instead.

BUG=386743
R=teravest@chromium.org, dmichael@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=283512

[Raphael Kubo da Costa (rakuco), 2014-07-15 08:44:55]

I'm not 100% sure this is the right fix -- it's also possible to just move
CanUseCompositorAPI() and CanUseVideoDecodeAPI() out of the ENABLE_WEBRTC block.

[teravest, 2014-07-15 17:07:36]

I think it's better to move CanUseCompositorAPI() and
CanUseVideoDecodeAPI() out of the ENABLE_WEBRTC block.
I can make that change if you'd like.

On Tue, Jul 15, 2014 at 2:44 AM,  <raphael.kubo.da.costa@intel.com> wrote:
> Reviewers: dmichael, teravest,
>
> Message:
> I'm not 100% sure this is the right fix -- it's also possible to just move
> CanUseCompositorAPI() and CanUseVideoDecodeAPI() out of the ENABLE_WEBRTC
> block.
>
> Description:
> Fix the build with enable_webrtc=0 after r281588.
>
> CanUseCompositorAPI() and CanUseVideoDecodeAPI() are only defined if
> WebRTC support is enabled, so do the same as the
> PpapiHostMsg_VideoSource_Create case and only check for
> PpapiHostMsg_Compositor_Create and PpapiHostMsg_VideoDecoder_Create if
> enable_webrtc=1.
>
> BUG=386743
> R=teravest@chromium.org, dmichael@chromium.org
>
> Please review this at https://codereview.chromium.org/390763003/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files (+10, -10 lines):
>   M content/renderer/pepper/content_renderer_pepper_host_factory.cc
>
>
> Index: content/renderer/pepper/content_renderer_pepper_host_factory.cc
> diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc
> b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
> index
>
4e2f8a192d64df9708e7a769f3bc4d83b67ca31d..eec3985ff4d2a325675beca1a1b7884578e51486
> 100644
> --- a/content/renderer/pepper/content_renderer_pepper_host_factory.cc
> +++ b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
> @@ -107,12 +107,6 @@ scoped_ptr<ResourceHost>
> ContentRendererPepperHostFactory::CreateResourceHost(
>
>    // Public interfaces.
>    switch (message.type()) {
> -    case PpapiHostMsg_Compositor_Create::ID: {
> -      if (!CanUseCompositorAPI(host_, instance))
> -        return scoped_ptr<ResourceHost>();
> -      return scoped_ptr<ResourceHost>(
> -          new PepperCompositorHost(host_, instance, params.pp_resource()));
> -    }
>      case PpapiHostMsg_FileRef_CreateForFileAPI::ID: {
>        PP_Resource file_system;
>        std::string internal_path;
> @@ -155,16 +149,22 @@ scoped_ptr<ResourceHost>
> ContentRendererPepperHostFactory::CreateResourceHost(
>      case PpapiHostMsg_URLLoader_Create::ID:
>        return scoped_ptr<ResourceHost>(new PepperURLLoaderHost(
>            host_, false, instance, params.pp_resource()));
> +    case PpapiHostMsg_WebSocket_Create::ID:
> +      return scoped_ptr<ResourceHost>(
> +          new PepperWebSocketHost(host_, instance, params.pp_resource()));
> +#if defined(ENABLE_WEBRTC)
> +    case PpapiHostMsg_Compositor_Create::ID: {
> +      if (!CanUseCompositorAPI(host_, instance))
> +        return scoped_ptr<ResourceHost>();
> +      return scoped_ptr<ResourceHost>(
> +          new PepperCompositorHost(host_, instance, params.pp_resource()));
> +    }
>      case PpapiHostMsg_VideoDecoder_Create::ID: {
>        if (!CanUseVideoDecodeAPI(host_, instance))
>          return scoped_ptr<ResourceHost>();
>        return scoped_ptr<ResourceHost>(
>            new PepperVideoDecoderHost(host_, instance,
> params.pp_resource()));
>      }
> -    case PpapiHostMsg_WebSocket_Create::ID:
> -      return scoped_ptr<ResourceHost>(
> -          new PepperWebSocketHost(host_, instance, params.pp_resource()));
> -#if defined(ENABLE_WEBRTC)
>      case PpapiHostMsg_MediaStreamVideoTrack_Create::ID:
>        return scoped_ptr<ResourceHost>(new PepperMediaStreamVideoTrackHost(
>            host_, instance, params.pp_resource()));
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[Raphael Kubo da Costa (rakuco), 2014-07-15 20:19:38]

Thanks for the review; I've implemented your suggestion in patch v2.

[teravest, 2014-07-15 21:35:56]

lgtm

[Raphael Kubo da Costa (rakuco), 2014-07-16 07:25:20]

The CQ bit was checked by raphael.kubo.da.costa@intel.com

[commit-bot: I haz the power, 2014-07-16 07:28:37]

CQ is trying da patch. Follow status at

https://chromium-status.appspot.com/cq/raphael.kubo.da.costa@intel.com/390763...

[commit-bot: I haz the power, 2014-07-16 11:41:22]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-07-16 21:27:26]

Change committed as 283512