media: Remove BrowserCdmFactory inferface.

chromecast/browser/cast_browser_main_parts.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_browser_main_parts.h"
 
 #include <string>
 #if !defined(OS_ANDROID)
 #include <signal.h>
 #include <sys/prctl.h>
@@ skipping 27 matching lines @@
 #include "chromecast/net/connectivity_checker.h"
 #include "chromecast/public/cast_media_shlib.h"
 #include "chromecast/public/cast_sys_info.h"
 #include "chromecast/service/cast_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_factory.h"
-#include "media/base/browser_cdm_factory.h"
 #include "media/base/media.h"
 #include "ui/compositor/compositor_switches.h"
 
 #if defined(OS_ANDROID)
 #include "chromecast/app/android/crash_handler.h"
 #include "chromecast/browser/media/cast_media_client_android.h"
 #include "components/crash/content/browser/crash_dump_manager_android.h"
 #include "media/base/android/media_client_android.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #else
@@ skipping 245 matching lines @@
 #endif  // !defined(OS_ANDROID)
 
   scoped_refptr<PrefRegistrySimple> pref_registry(new PrefRegistrySimple());
   metrics::RegisterPrefs(pref_registry.get());
   cast_browser_process_->SetPrefService(
       PrefServiceHelper::CreatePrefService(pref_registry.get()));
 
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
 #if defined(OS_ANDROID)
   ::media::SetMediaClientAndroid(new media::CastMediaClientAndroid());
-#else
-  if (cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline)) {
-    scoped_ptr<::media::BrowserCdmFactory> cdm_factory =
-        cast_browser_process_->browser_client()->CreateBrowserCdmFactory();
-    ::media::SetBrowserCdmFactory(cdm_factory.release());
-  }

[halliwell, 2015/11/05 22:20:41]

Our existing behaviour here is to only provide a BrowserCdmFactory if
kEnableCmaMediaPipeline switch is set.

So, seems like we should apply that same check in
CastContentBrowserClient::CreateCdmFactory?

[xhwang, 2015/11/05 23:06:11]

oops, I thought about that but then forgot. Thanks for catching it.

Done.

 #endif  // defined(OS_ANDROID)
 
   cast_browser_process_->SetConnectivityChecker(
       ConnectivityChecker::Create(
           content::BrowserThread::GetMessageLoopProxyForThread(
               content::BrowserThread::IO)));
 
   cast_browser_process_->SetNetLog(net_log_.get());
 
   url_request_context_factory_->InitializeOnUIThread(net_log_.get());
@@ skipping 75 matching lines @@
 #if defined(USE_AURA)
   aura::Env::DeleteInstance();
 #endif
 
   DeregisterKillOnAlarm();
 #endif
 }
 
 }  // namespace shell
 }  // namespace chromecast