media: Refactor MediaCrypto creation and notification.

media/base/android/video_decoder_job.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 "media/base/android/video_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread.h"
 #include "media/base/android/media_drm_bridge.h"
@@ skipping 118 matching lines @@
   // If we cannot find a key frame in cache, browser seek is needed.
   bool next_video_data_is_iframe = SetCurrentFrameToPreviouslyCachedKeyFrame();
   if (!next_video_data_is_iframe)
     return STATUS_KEY_FRAME_REQUIRED;
 
   bool is_secure = is_content_encrypted() && drm_bridge() &&
       drm_bridge()->IsProtectedSurfaceRequired();
 
   media_codec_bridge_.reset(VideoCodecBridge::CreateDecoder(
       video_codec_, is_secure, gfx::Size(config_width_, config_height_),
-      surface_.j_surface().obj(), GetMediaCrypto().obj()));
+      surface_.j_surface().obj(), GetMediaCrypto()));
 
   if (!media_codec_bridge_)
     return STATUS_FAILURE;
 
   return STATUS_SUCCESS;
 }
 
 bool VideoDecoderJob::UpdateOutputFormat() {
   if (!media_codec_bridge_)
     return false;
   int prev_output_width = output_width_;
   int prev_output_height = output_height_;
   // See b/18224769. The values reported from MediaCodecBridge::GetOutputFormat
   // correspond to the actual video frame size, but this is not necessarily the
   // size that should be output.
   output_width_ = config_width_;
   output_height_ = config_height_;
   return (output_width_ != prev_output_width) ||
       (output_height_ != prev_output_height);
 }
 
 bool VideoDecoderJob::IsProtectedSurfaceRequired() {
   return is_content_encrypted() && drm_bridge() &&
       drm_bridge()->IsProtectedSurfaceRequired();
 }
 
 }  // namespace media