Allow setContentDecryptionModule() to get called when setting is done.

media/filters/pipeline_integration_test_base.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 "media/filters/pipeline_integration_test_base.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "media/base/media_log.h"
 #include "media/base/time_delta_interpolator.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
 #include "media/filters/opus_audio_decoder.h"
 #include "media/filters/vpx_video_decoder.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::AtMost;
+using ::testing::Eq;
 using ::testing::SaveArg;
 
 namespace media {
 
 const char kNullVideoHash[] = "d41d8cd98f00b204e9800998ecf8427e";
 const char kNullAudioHash[] = "0.00,0.00,0.00,0.00,0.00,0.00,";
 
 PipelineIntegrationTestBase::PipelineIntegrationTestBase()
     : hashing_enabled_(false),
       clockless_playback_(false),
@@ skipping 267 matching lines @@
     audio_sink_->StartAudioHashForTesting();
   scoped_ptr<AudioRenderer> audio_renderer(audio_renderer_impl);
   collection->SetAudioRenderer(audio_renderer.Pass());
 
   return collection.Pass();
 }
 
 void PipelineIntegrationTestBase::SetDecryptor(
     Decryptor* decryptor,
     const DecryptorReadyCB& decryptor_ready_cb) {
-  decryptor_ready_cb.Run(decryptor);
+  EXPECT_CALL(*this, DecryptorAttached(Eq(true)));

[ddorwin, 2014/08/07 19:52:04]

Is there a reason this comes first in this case?

[jrummell, 2014/08/08 20:58:28]

I had assumed EXPECT... needs to be called before some code actually executes a
call to the method. But appears to not be the case, so moved it below.

+  decryptor_ready_cb.Run(
+      decryptor,
+      base::Bind(&PipelineIntegrationTestBase::DecryptorAttached,
+                 base::Unretained(this)));
 }
 
 void PipelineIntegrationTestBase::OnVideoRendererPaint(
     const scoped_refptr<VideoFrame>& frame) {
   last_video_frame_format_ = frame->format();
   if (!hashing_enabled_)
     return;
   frame->HashFrameForTesting(&md5_context_);
 }
 
@@ skipping 13 matching lines @@
   DCHECK(clockless_playback_);
   return clockless_audio_sink_->render_time();
 }
 
 base::TimeTicks DummyTickClock::NowTicks() {
   now_ += base::TimeDelta::FromSeconds(60);
   return now_;
 }
 
 }  // namespace media