Encrypted Media: Replace DecryptorClient with key event callbacks.

media/filters/video_decoder_selector_unittest.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 <vector>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "media/base/gmock_callback_support.h"
 #include "media/base/mock_filters.h"
@@ skipping 111 matching lines @@
                    base::Unretained(this)));
     message_loop_.RunUntilIdle();
   }
 
   // Fixture members.
   scoped_ptr<VideoDecoderSelector> decoder_selector_;
   VideoDecoderConfig clear_video_config_;
   VideoDecoderConfig encrypted_video_config_;
   scoped_refptr<StrictMock<MockDemuxerStream> > demuxer_stream_;
   // Use NiceMock since we don't care about most of calls on the decryptor, e.g.
-  // RegisterKeyAddedCB().
+  // RegisterNewKeyCB().
   scoped_ptr<NiceMock<MockDecryptor> > decryptor_;
   scoped_refptr<StrictMock<MockVideoDecoder> > decoder_1_;
   scoped_refptr<StrictMock<MockVideoDecoder> > decoder_2_;
   std::vector<scoped_refptr<VideoDecoder> > all_decoders_;
 
   scoped_refptr<VideoDecoder> selected_decoder_;
 
   MessageLoop message_loop_;
 
  private:
@@ skipping 120 matching lines @@
   UseEncryptedStream();
   InitializeDecoderSelector(kDecryptAndDecode, 1);
 
   EXPECT_CALL(*this, OnDecoderSelected(NotNull(), IsNull()))
       .WillOnce(SaveArg<0>(&selected_decoder_));
 
   SelectDecoder();
 }
 
 }  // namespace media