media: Call SetMediaClientAndroid() in content for browser process

chrome/browser/chrome_browser_main_android.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 "chrome/browser/chrome_browser_main_android.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/android/seccomp_support_detector.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/common/chrome_media_client_android.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/browser/crash_dump_manager_android.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/main_function_params.h"
-#include "media/base/android/media_client_android.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #include "net/base/network_change_notifier.h"
 #include "ui/base/resource/resource_bundle_android.h"
 #include "ui/base/ui_base_paths.h"
 
 namespace {
 
 void DeleteFileTask(
     const base::FilePath& file_path) {
   if (base::PathExists(file_path))
@@ skipping 78 matching lines @@
 
   {
     TRACE_EVENT0("startup",
       "ChromeBrowserMainPartsAndroid::PreEarlyInitialization:StartUiMsgLoop");
     base::MessageLoopForUI::current()->Start();
   }
 
   ChromeBrowserMainParts::PreEarlyInitialization();
 }
 
 void ChromeBrowserMainPartsAndroid::PreMainMessageLoopRun() {

[Lei Zhang, 2016/06/14 23:38:50]

You can get rid of this altogether if all it's doing is calling its parent
class.

[xhwang, 2016/06/15 00:31:52]

Done.

-  media::SetMediaClientAndroid(new ChromeMediaClientAndroid);
-
   ChromeBrowserMainParts::PreMainMessageLoopRun();
 }
 
 void ChromeBrowserMainPartsAndroid::PostBrowserStart() {
   ChromeBrowserMainParts::PostBrowserStart();
 
   content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE,
       base::Bind(&SeccompSupportDetector::StartDetection),
       base::TimeDelta::FromMinutes(1));
 }
 
 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() {
   NOTREACHED();
 }