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

media/filters/pipeline_integration_test_base.cc

Index: media/filters/pipeline_integration_test_base.cc
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 54e7f58aea6eabfc780e4f21d3fa376e0fd5d6bf..e1cb9782abddaa4108af914f91c2fd61be92dddd 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -20,6 +20,7 @@
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::AtMost;
+using ::testing::Eq;
 using ::testing::SaveArg;
 
 namespace media {
@@ -307,7 +308,11 @@ PipelineIntegrationTestBase::CreateFilterCollection(
 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(