media: Remove BrowserCdmFactory inferface.

chromecast/browser/cast_content_browser_client.cc

 // Copyright 2014 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 "chromecast/browser/cast_content_browser_client.h"
 
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 72 matching lines @@
 #if !defined(OS_ANDROID)
 scoped_ptr<::media::AudioManagerFactory>
 CastContentBrowserClient::CreateAudioManagerFactory() {
   return make_scoped_ptr(new media::CastAudioManagerFactory());
 }
 
 scoped_refptr<media::CmaMediaPipelineClient>
 CastContentBrowserClient::CreateCmaMediaPipelineClient() {
   return make_scoped_refptr(new media::CmaMediaPipelineClient());
 }
-
-scoped_ptr<::media::BrowserCdmFactory>
-CastContentBrowserClient::CreateBrowserCdmFactory() {
-  return make_scoped_ptr(new media::CastBrowserCdmFactory());
-}
 #endif  // OS_ANDROID
 
 void CastContentBrowserClient::ProcessExiting() {
   // Finalize CastMediaShlib on media thread to ensure it's not accessed
   // after Finalize.
   media::MediaMessageLoop::GetTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&media::CastMediaShlib::Finalize));
 }
 
 void CastContentBrowserClient::SetMetricsClientId(
@@ skipping 249 matching lines @@
 
 void CastContentBrowserClient::RegisterUnsandboxedOutOfProcessMojoApplications(
     std::map<GURL, base::string16>* apps) {
 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
   apps->insert(std::make_pair(GURL("mojo:media"),
                               base::ASCIIToUTF16("Media App")));
 #endif
 }
 
 #if defined(OS_ANDROID)
+
 void CastContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
     content::FileDescriptorInfo* mappings,
     std::map<int, base::MemoryMappedFile::Region>* regions) {
   mappings->Share(
       kAndroidPakDescriptor,
       base::GlobalDescriptors::GetInstance()->Get(kAndroidPakDescriptor));
   regions->insert(std::make_pair(
       kAndroidPakDescriptor, base::GlobalDescriptors::GetInstance()->GetRegion(
                                  kAndroidPakDescriptor)));
 
   if (breakpad::IsCrashReporterEnabled()) {
     base::File minidump_file(
         breakpad::CrashDumpManager::GetInstance()->CreateMinidumpFile(
             child_process_id));
     if (!minidump_file.IsValid()) {
       LOG(ERROR) << "Failed to create file for minidump, crash reporting will "
                  << "be disabled for this process.";
     } else {
       mappings->Transfer(kAndroidMinidumpDescriptor,
                          base::ScopedFD(minidump_file.TakePlatformFile()));
     }
   }
 }
+
 #else
+
+scoped_ptr<::media::CdmFactory> CastContentBrowserClient::CreateCdmFactory() {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableCmaMediaPipeline)) {
+    return make_scoped_ptr(new media::CastBrowserCdmFactory());
+  }
+
+  return nullptr;
+}
+
 void CastContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
     content::FileDescriptorInfo* mappings) {
   int crash_signal_fd = GetCrashSignalFD(command_line);
   if (crash_signal_fd >= 0) {
     mappings->Share(kCrashDumpSignal, crash_signal_fd);
   }
 }
+
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_ANDROID) && defined(VIDEO_HOLE)
 content::ExternalVideoSurfaceContainer*
 CastContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
     content::WebContents* web_contents) {
   return external_video_surface::ExternalVideoSurfaceContainerImpl::Create(
       web_contents);
 }
 #endif  // defined(OS_ANDROID) && defined(VIDEO_HOLE)
@@ skipping 32 matching lines @@
         process_type, dumps_path, false /* upload */);
   // StartUploaderThread() even though upload is diferred.
   // Breakpad-related memory is freed in the uploader thread.
   crash_handler->StartUploaderThread();
   return crash_handler;
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace shell
 }  // namespace chromecast