Chromecast: change BrowserCdmCast threading model.

chromecast/media/cma/pipeline/av_pipeline_impl.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/media/cma/pipeline/av_pipeline_impl.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "chromecast/media/base/decrypt_context.h"
 #include "chromecast/media/cdm/browser_cdm_cast.h"
 #include "chromecast/media/cma/backend/media_clock_device.h"
 #include "chromecast/media/cma/backend/media_component_device.h"
 #include "chromecast/media/cma/base/buffering_frame_provider.h"
 #include "chromecast/media/cma/base/buffering_state.h"
 #include "chromecast/media/cma/base/cma_logging.h"
 #include "chromecast/media/cma/base/coded_frame_provider.h"
 #include "chromecast/media/cma/base/decoder_buffer_base.h"
 #include "chromecast/media/cma/pipeline/decrypt_util.h"
 #include "media/base/audio_decoder_config.h"
+#include "media/base/bind_to_current_loop.h"
 #include "media/base/decrypt_config.h"
 
 namespace chromecast {
 namespace media {
 
 namespace {
 
 const int kNoCallbackId = -1;
 
 }  // namespace
@@ skipping 148 matching lines @@
 
 void AvPipelineImpl::SetCdm(BrowserCdmCast* media_keys) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(media_keys);
 
   if (media_keys_ && media_keys_callback_id_ != kNoCallbackId)
     media_keys_->UnregisterPlayer(media_keys_callback_id_);
 
   media_keys_ = media_keys;
   media_keys_callback_id_ = media_keys_->RegisterPlayer(
-      base::Bind(&AvPipelineImpl::OnCdmStateChanged, weak_this_),
-      base::Bind(&AvPipelineImpl::OnCdmDestroyed, weak_this_));
+      ::media::BindToCurrentLoop(
+          base::Bind(&AvPipelineImpl::OnCdmStateChanged, weak_this_)),
+      ::media::BindToCurrentLoop(
+          base::Bind(&AvPipelineImpl::OnCdmDestroyed, weak_this_)));
 }
 
 void AvPipelineImpl::OnEos() {
   DCHECK(thread_checker_.CalledOnValidThread());
   CMALOG(kLogControl) << __FUNCTION__;
   if (state_ != kPlaying)
     return;
 
   if (!client_.eos_cb.is_null())
     client_.eos_cb.Run();
@@ skipping 177 matching lines @@
       }
     }
 
     // The frame is playable: remove it from the list of non playable frames.
     non_playable_frames_.pop_front();
   }
 }
 
 }  // namespace media
 }  // namespace chromecast