Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction.

android_webview/browser/aw_browser_main_parts.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 "android_webview/browser/aw_browser_main_parts.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_dev_tools_discovery_provider.h"
+#include "android_webview/browser/aw_media_client_android.h"
 #include "android_webview/browser/aw_result_codes.h"
+#include "android_webview/common/aw_resource.h"

[boliu, 2015/04/29 19:24:25]

include not necessary?

[gunsch, 2015/04/29 20:29:43]

Necessary for AwResource::GetConfigKeySystemUuidMapping call below

 #include "android_webview/native/public/aw_assets.h"
 #include "base/android/build_info.h"
 #include "base/android/locale_utils.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "components/devtools_discovery/devtools_discovery_manager.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_utils.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/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
 namespace android_webview {
 
 AwBrowserMainParts::AwBrowserMainParts(AwBrowserContext* browser_context)
@@ skipping 61 matching lines @@
 }
 
 void AwBrowserMainParts::PreMainMessageLoopRun() {
   browser_context_->PreMainMessageLoopRun();
 
   devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
       devtools_discovery::DevToolsDiscoveryManager::GetInstance();
   discovery_manager->AddProvider(make_scoped_ptr(
       new AwDevToolsDiscoveryProvider()));
 
+  media::SetMediaClientAndroid(
+      new AwMediaClientAndroid(AwResource::GetConfigKeySystemUuidMapping()));

[boliu, 2015/04/29 19:24:25]

So chrome does this in PreEarlyInitialization, and webview and chromecast does
this in PreMainMessageLoopRun.

I'm guessing it doesn't matter which one it happens in? So maybe just be
consistent across platforms?

[gunsch, 2015/04/29 20:29:43]

Sure, updated Chrome to do this in PreMainMessageLoopRun for consistency.

+
   // This is needed for WebView Classic backwards compatibility
   // See crbug.com/298495
   content::SetMaxURLChars(20 * 1024 * 1024);
 }
 
 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop.
   return true;
 }
 
 }  // namespace android_webview