Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction.

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"
 
 #if !defined(OS_ANDROID)
 #include <signal.h>
 #include <sys/prctl.h>
 #endif
@@ skipping 11 matching lines @@
 #include "chromecast/browser/cast_browser_context.h"
 #include "chromecast/browser/cast_browser_process.h"
 #include "chromecast/browser/devtools/remote_debugging_server.h"
 #include "chromecast/browser/metrics/cast_metrics_prefs.h"
 #include "chromecast/browser/metrics/cast_metrics_service_client.h"
 #include "chromecast/browser/pref_service_helper.h"
 #include "chromecast/browser/service/cast_service.h"
 #include "chromecast/browser/url_request_context_factory.h"
 #include "chromecast/common/chromecast_switches.h"
 #include "chromecast/common/platform_client_auth.h"
+#include "chromecast/media/base/key_systems_common.h"
 #include "chromecast/net/connectivity_checker.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "media/base/browser_cdm_factory.h"
 #include "media/base/media_switches.h"
 
 #if defined(OS_ANDROID)
+#include "chromecast/browser/media/cast_media_client_android.h"
 #include "chromecast/crash/android/crash_handler.h"
 #include "components/crash/browser/crash_dump_manager_android.h"
+#include "media/base/android/media_client_android.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #else
 #include "chromecast/browser/media/cast_browser_cdm_factory.h"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/test/test_screen.h"
 #include "ui/gfx/screen.h"
 #endif
 
@@ skipping 201 matching lines @@
 #endif
   return 0;
 }
 
 void CastBrowserMainParts::PreMainMessageLoopRun() {
   scoped_refptr<PrefRegistrySimple> pref_registry(new PrefRegistrySimple());
   metrics::RegisterPrefs(pref_registry.get());
   cast_browser_process_->SetPrefService(
       PrefServiceHelper::CreatePrefService(pref_registry.get()));
 
-#if !defined(OS_ANDROID)
+#if defined(OS_ANDROID)
+  ::media::SetMediaClientAndroid(new media::CastMediaClientAndroid);

[xhwang, 2015/04/24 04:52:23]

ditto

+#else
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline))
     ::media::SetBrowserCdmFactory(new media::CastBrowserCdmFactory);
-#endif  // !defined(OS_ANDROID)
+#endif  // defined(OS_ANDROID)
 
   cast_browser_process_->SetConnectivityChecker(
       make_scoped_refptr(new ConnectivityChecker(
           content::BrowserThread::GetMessageLoopProxyForThread(
               content::BrowserThread::IO))));
 
   url_request_context_factory_->InitializeOnUIThread();
 
   cast_browser_process_->SetBrowserContext(
       make_scoped_ptr(new CastBrowserContext(url_request_context_factory_)));
@@ skipping 63 matching lines @@
 #else
   cast_browser_process_->cast_service()->Finalize();
   cast_browser_process_->metrics_service_client()->Finalize();
   cast_browser_process_.reset();
   DeregisterKillOnAlarm();
 #endif
 }
 
 }  // namespace shell
 }  // namespace chromecast