Add "type" in GenerateKeyRequest() and OnNeedKey().

media/base/mock_filters.h

 // 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.
 //
 // A new breed of mock media filters, this time using gmock!  Feel free to add
 // actions if you need interesting side-effects.
 //
 // Don't forget you can use StrictMock<> and NiceMock<> if you want the mock
 // filters to fail the test or do nothing when an unexpected method is called.
 // http://code.google.com/p/googlemock/wiki/CookBook#Nice_Mocks_and_Strict_Mocks
@@ skipping 178 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioRenderer);
 };
 
 class MockDecryptor : public Decryptor {
  public:
   MockDecryptor();
   virtual ~MockDecryptor();
 
-  MOCK_METHOD3(GenerateKeyRequest, bool(const std::string& key_system,
+  MOCK_METHOD4(GenerateKeyRequest, bool(const std::string& key_system,
+                                        const std::string& type,
                                         const uint8* init_data,
                                         int init_data_length));
   MOCK_METHOD6(AddKey, void(const std::string& key_system,
                             const uint8* key,
                             int key_length,
                             const uint8* init_data,
                             int init_data_length,
                             const std::string& session_id));
   MOCK_METHOD2(CancelKeyRequest, void(const std::string& key_system,
                                       const std::string& session_id));
@@ skipping 42 matching lines @@
                               Decryptor::KeyError, int));
   // TODO(xhwang): This is a workaround of the issue that move-only parameters
   // are not supported in mocked methods. Remove this when the issue is fixed
   // (http://code.google.com/p/googletest/issues/detail?id=395) or when we use
   // std::string instead of scoped_array<uint8> (http://crbug.com/130689).
   MOCK_METHOD5(KeyMessageMock, void(const std::string& key_system,
                                     const std::string& session_id,
                                     const uint8* message,
                                     int message_length,
                                     const std::string& default_url));
-  MOCK_METHOD4(NeedKeyMock, void(const std::string& key_system,
+  MOCK_METHOD5(NeedKeyMock, void(const std::string& key_system,
                                  const std::string& session_id,
+                                 const std::string& type,
                                  const uint8* init_data,
                                  int init_data_length));
   virtual void KeyMessage(const std::string& key_system,
                           const std::string& session_id,
                           scoped_array<uint8> message,
                           int message_length,
                           const std::string& default_url) OVERRIDE;
   virtual void NeedKey(const std::string& key_system,
                        const std::string& session_id,
+                       const std::string& type,
                        scoped_array<uint8> init_data,
                        int init_data_length) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDecryptorClient);
 };
 
 // FilterFactory that returns canned instances of mock filters.  You can set
 // expectations on the filters and then pass the collection into a pipeline.
 class MockFilterCollection {
@@ skipping 30 matching lines @@
  public:
   MockStatisticsCB();
   ~MockStatisticsCB();
 
   MOCK_METHOD1(OnStatistics, void(const media::PipelineStatistics& statistics));
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_