Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Side by Side Diff: media/filters/pipeline_integration_test.cc

Issue 17309003: Removed unused NeedKey callback from Decryptors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/filters/pipeline_integration_test_base.h" 5 #include "media/filters/pipeline_integration_test_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 scoped_ptr<uint8[]> init_data, int init_data_length, 85 scoped_ptr<uint8[]> init_data, int init_data_length,
86 AesDecryptor* decryptor) = 0; 86 AesDecryptor* decryptor) = 0;
87 }; 87 };
88 88
89 FakeEncryptedMedia(AppBase* app) 89 FakeEncryptedMedia(AppBase* app)
90 : decryptor_(base::Bind(&FakeEncryptedMedia::KeyAdded, 90 : decryptor_(base::Bind(&FakeEncryptedMedia::KeyAdded,
91 base::Unretained(this)), 91 base::Unretained(this)),
92 base::Bind(&FakeEncryptedMedia::KeyError, 92 base::Bind(&FakeEncryptedMedia::KeyError,
93 base::Unretained(this)), 93 base::Unretained(this)),
94 base::Bind(&FakeEncryptedMedia::KeyMessage, 94 base::Bind(&FakeEncryptedMedia::KeyMessage,
95 base::Unretained(this)),
96 base::Bind(&FakeEncryptedMedia::NeedKey,
97 base::Unretained(this))), 95 base::Unretained(this))),
98 app_(app) { 96 app_(app) {
99 } 97 }
100 98
101 AesDecryptor* decryptor() { 99 AesDecryptor* decryptor() {
102 return &decryptor_; 100 return &decryptor_;
103 } 101 }
104 102
105 // Callbacks for firing key events. Delegate to |app_|. 103 // Callbacks for firing key events. Delegate to |app_|.
106 void KeyAdded(const std::string& session_id) { 104 void KeyAdded(const std::string& session_id) {
(...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 945
948 // Verify that VP8 video with inband text track can be played back. 946 // Verify that VP8 video with inband text track can be played back.
949 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8_WebVTT_WebM) { 947 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8_WebVTT_WebM) {
950 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"), 948 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"),
951 PIPELINE_OK)); 949 PIPELINE_OK));
952 Play(); 950 Play();
953 ASSERT_TRUE(WaitUntilOnEnded()); 951 ASSERT_TRUE(WaitUntilOnEnded());
954 } 952 }
955 953
956 } // namespace media 954 } // namespace media
OLDNEW
« no previous file with comments | « media/crypto/aes_decryptor_unittest.cc ('k') | webkit/plugins/ppapi/content_decryptor_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698