Move MediaDrmBridge provision communication to native side.

chrome/browser/media/android/cdm/media_drm_credential_manager.cc

 // Copyright 2013 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/media/android/cdm/media_drm_credential_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
+#include "chrome/browser/browser_process.h"
+#include "content/public/browser/android/provision_fetcher_factory.h"
 #include "jni/MediaDrmCredentialManager_jni.h"
 #include "media/base/android/media_drm_bridge.h"
+#include "media/base/android/provision_fetcher.h"
 #include "url/gurl.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 using base::android::ScopedJavaGlobalRef;
 
 namespace {
 
 void MediaDrmCredentialManagerCallback(
     const ScopedJavaGlobalRef<jobject>& j_media_drm_credential_manager_callback,
     bool succeeded) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_MediaDrmCredentialManagerCallback_onCredentialResetFinished(
       env, j_media_drm_credential_manager_callback.obj(), succeeded);
 }
 
 }  // namespace
 
-MediaDrmCredentialManager::MediaDrmCredentialManager() {}
+MediaDrmCredentialManager::MediaDrmCredentialManager() {
+  DCHECK(g_browser_process);
+  provision_fetcher_factory_.reset(content::CreateURLProvisionFetcherFactory(
+      g_browser_process->system_request_context()));

[xhwang, 2015/11/12 22:27:03]

Did you try this and does it work? I don't see why not but just double
checking...

[Tima Vaisburd, 2015/11/13 03:13:10]

Yes, I tested and it worked for me.

+}
 
 MediaDrmCredentialManager::~MediaDrmCredentialManager() {}
 
 // static
 MediaDrmCredentialManager* MediaDrmCredentialManager::GetInstance() {
   return base::Singleton<MediaDrmCredentialManager>::get();
 }
 
 void MediaDrmCredentialManager::ResetCredentials(
     const ResetCredentialsCB& reset_credentials_cb) {
@@ skipping 37 matching lines @@
     success = false;
   }
 
   base::ResetAndReturn(&reset_credentials_cb_).Run(success);
   media_drm_bridge_ = nullptr;
 }
 
 // TODO(ddorwin): The key system should be passed in. http://crbug.com/459400
 bool MediaDrmCredentialManager::ResetCredentialsInternal(
     SecurityLevel security_level) {
-  media_drm_bridge_ =
-      media::MediaDrmBridge::CreateWithoutSessionSupport(kWidevineKeySystem);
+  scoped_ptr<media::ProvisionFetcher> provision_fetcher =
+      provision_fetcher_factory_->CreateFetcher();
+
+  media_drm_bridge_ = media::MediaDrmBridge::CreateWithoutSessionSupport(
+      kWidevineKeySystem, provision_fetcher.Pass());

[xhwang, 2015/11/12 22:27:03]

nit: you can just put provision_fetcher_factory_->CreateFetcher() here.

[xhwang, 2015/11/12 22:27:03]

Actually, if we have something like content::CreateProvisionFetcher(), we can
call it directly here. This makes me wonder whether we really need a Factory
class. See my comment at the bottom of this PS.

[Tima Vaisburd, 2015/11/13 03:13:10]

Done.

   if (!media_drm_bridge_)
     return false;
 
   ResetCredentialsCB reset_credentials_cb =
       base::Bind(&MediaDrmCredentialManager::OnResetCredentialsCompleted,
                  base::Unretained(this), security_level);
 
   if (!media_drm_bridge_->SetSecurityLevel(security_level)) {
     // No need to reset credentials for unsupported |security_level|.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(reset_credentials_cb, true));
     return true;
   }
 
   media_drm_bridge_->ResetDeviceCredentials(reset_credentials_cb);
   return true;
 }
 
 // static
 bool MediaDrmCredentialManager::RegisterMediaDrmCredentialManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }