media: Rename MediaKeys to ContentDecryptionModule

media/mojo/clients/mojo_cdm_unittest.cc

 // Copyright 2016 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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 60 matching lines @@
     base::RunLoop().RunUntilIdle();
 
     if (expected_result == SUCCESS) {
       EXPECT_TRUE(mojo_cdm_);
     } else {
       EXPECT_FALSE(mojo_cdm_);
     }
   }
 
   void OnCdmCreated(ExpectedResult expected_result,
-                    const scoped_refptr<MediaKeys>& cdm,
+                    const scoped_refptr<ContentDecryptionModule>& cdm,

[jrummell, 2016/12/12 22:08:40]

nit; Should probably include content_decryption_module.h

[xhwang, 2016/12/12 22:32:51]

Done.

                     const std::string& error_message) {
     if (!cdm) {
       DVLOG(1) << error_message;
       return;
     }
 
     EXPECT_EQ(SUCCESS, expected_result);
     mojo_cdm_ = cdm;
   }
 
   // Fixture members.
   base::TestMessageLoop message_loop_;
 
   MojoCdmServiceContext mojo_cdm_service_context_;
   StrictMock<MockCdmClient> cdm_client_;
 
   // TODO(jrummell): Use a MockCdmFactory to create a MockCdm here for more test
   // coverage.
   DefaultCdmFactory cdm_factory_;
 
   std::unique_ptr<MojoCdmService> mojo_cdm_service_;
   mojo::Binding<mojom::ContentDecryptionModule> cdm_binding_;
-  scoped_refptr<MediaKeys> mojo_cdm_;
+  scoped_refptr<ContentDecryptionModule> mojo_cdm_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MojoCdmTest);
 };
 
 TEST_F(MojoCdmTest, Create_Success) {
   Initialize(SUCCESS);
 }
 
 TEST_F(MojoCdmTest, Create_ConnectionError) {
   Initialize(CONNECTION_ERROR);
 }
 
 // TODO(xhwang): Add more test cases!
 
 }  // namespace media