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

components/html_viewer/setup.cc

-// 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.
 
 #include "components/html_viewer/setup.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "components/html_viewer/blink_platform_impl.h"
@@ skipping 52 matching lines @@
 }  // namespace
 
 Setup::Setup(mojo::ApplicationImpl* app)
     : app_(app),
       resource_loader_(app->shell(), GetResourcePaths()),
       is_headless_(
           base::CommandLine::ForCurrentProcess()->HasSwitch(kIsHeadless)),
       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();
 }
 
 Setup::~Setup() {
 }
 
 void Setup::InitHeadless() {
   DCHECK(!did_init_);
   is_headless_ = true;
@@ skipping 54 matching lines @@
     // TODO(sky): why is this always using 100?
     ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
         resource_loader_.ReleaseFile(kResourceUIPak), ui::SCALE_FACTOR_100P);
   }
 
   compositor_thread_.Start();
 #if defined(OS_ANDROID)
   // 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
 }
 
 }  // namespace html_viewer