Add CdmService to keep track of CDMs

content/browser/browser_main_loop.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/browser/browser_main_loop.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 153 matching lines @@
 #if !defined(OS_ANDROID)
 #include "content/public/browser/zygote_handle_linux.h"
 #endif  // !defined(OS_ANDROID)
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
 
 #if defined(ENABLE_PLUGINS)
 #include "content/browser/plugin_service_impl.h"
 #endif
 
+#if defined(ENABLE_MOJO_MEDIA)

[xhwang, 2016/04/13 00:22:12]

#if defined(ENABLE_MOJO_CDM) && defined(ENABLE_PEPPER_CDMS)

[jrummell, 2016/04/14 01:32:16]

Done.

+#include "content/browser/media/cdm_service_impl.h"
+#endif
+
 #if defined(USE_X11)
 #include "ui/base/x/x11_util_internal.h"
 #include "ui/gfx/x/x11_connection.h"
 #include "ui/gfx/x/x11_switches.h"
 #include "ui/gfx/x/x11_types.h"
 #endif
 
 #if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL)
 #include "crypto/nss_util.h"
 #endif
@@ skipping 552 matching lines @@
   // Prior to any processing happening on the IO thread, we create the
   // plugin service as it is predominantly used from the IO thread,
   // but must be created on the main thread. The service ctor is
   // inexpensive and does not invoke the io_thread() accessor.
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::CreateThreads:PluginService");
     PluginService::GetInstance()->Init();
   }
 #endif
 
+#if defined(ENABLE_MOJO_MEDIA)

[xhwang, 2016/04/13 00:22:12]

ditto

[jrummell, 2016/04/14 01:32:16]

Done.

+  // Prior to any processing happening on the IO thread, we create the
+  // CDM service as it is predominantly used from the IO thread.

[xhwang, 2016/04/13 00:22:12]

Also mention that this must be called on the main thread since it involves file
path check.

[jrummell, 2016/04/14 01:32:16]

Done.

+  CdmService::GetInstance()->Init();
+#endif
+
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   // The WindowResizeHelper allows the UI thread to wait on specific renderer
   // and GPU messages from the IO thread. Initializing it before the IO thread
   // starts ensures the affected IO thread messages always have somewhere to go.
   ui::WindowResizeHelperMac::Get()->Init(base::ThreadTaskRunnerHandle::Get());
 #endif
 
   // 1) Need to initialize in-process GpuDataManager before creating threads.
   // It's unsafe to append the gpu command line switches to the global
   // CommandLine::ForCurrentProcess object after threads are created.
@@ skipping 721 matching lines @@
   DCHECK(is_tracing_startup_for_duration_);
 
   is_tracing_startup_for_duration_ = false;
   TracingController::GetInstance()->StopTracing(
       TracingController::CreateFileSink(
           startup_trace_file_,
           base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
 }
 
 }  // namespace content