media: Support creation and SetCdm() for mojo based CDM.

components/html_viewer/setup.cc

Index: components/html_viewer/setup.cc
diff --git a/components/html_viewer/setup.cc b/components/html_viewer/setup.cc
index 74a53b8781d905b16c6df8e908ff73874ae8a5de..8f753050ecff420851d8d27c91985ceb7aa44b0f 100644
--- a/components/html_viewer/setup.cc
+++ b/components/html_viewer/setup.cc
@@ -1,4 +1,3 @@
-// Copyright 2015 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.
 
@@ -71,7 +70,10 @@ Setup::Setup(mojo::ApplicationImpl* app)
       did_init_(false),
       device_pixel_ratio_(1.f),
       discardable_memory_allocator_(kDesiredMaxMemory),
-      compositor_thread_("compositor thread") {
+      compositor_thread_("compositor thread"),
+      enable_mojo_media_renderer_(
+          base::CommandLine::ForCurrentProcess()->HasSwitch(
+              kEnableMojoMediaRenderer)) {
   if (is_headless_)
     InitHeadless();
 }
@@ -146,11 +148,8 @@ void Setup::InitIfNecessary(const gfx::Size& screen_size_in_pixels,
   // TODO(sky): Get WebMediaPlayerFactory working on android.
   NOTIMPLEMENTED();
 #else
-  bool enable_mojo_media_renderer =
-      command_line->HasSwitch(kEnableMojoMediaRenderer);
-
   web_media_player_factory_.reset(new WebMediaPlayerFactory(
-      compositor_thread_.message_loop_proxy(), enable_mojo_media_renderer));
+      compositor_thread_.message_loop_proxy(), enable_mojo_media_renderer_));
 #endif
 }