Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

media/tools/player_x11/player_x11.cc

Index: media/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index f0653875c8133a30f57bc18e0b88f601b6ec0a82..c673723281f31cd23deb96cd4a382382a281dff3 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -95,8 +95,8 @@ static void OnAddTextTrack(const media::TextTrackConfig& config,
                            const media::AddTextTrackDoneCB& done_cb) {
 }
 
-static void NeedKey(const std::string& type,
-                    const std::vector<uint8>& init_data) {
+static void OnEncryptedMediaInitData(const std::string& init_data_type,
+                                     const std::vector<uint8>& init_data) {
   std::cout << "File is encrypted." << std::endl;
 }
 
@@ -281,7 +281,7 @@ int main(int argc, char** argv) {
       CreateDataSource(filename), command_line->HasSwitch("streaming")));
   scoped_ptr<media::Demuxer> demuxer(new media::FFmpegDemuxer(
       media_thread.message_loop_proxy(), data_source.get(),
-      base::Bind(&NeedKey), new media::MediaLog()));
+      base::Bind(&OnEncryptedMediaInitData), new media::MediaLog()));
 
   media::Pipeline pipeline(media_thread.message_loop_proxy(),
                            new media::MediaLog());