Revert 167826 "Rename text track methods to make way for audio &..."

trunk/Source/platform/graphics/media/MediaPlayer.h

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 85 matching lines @@
     virtual void mediaPlayerKeyAdded(const String& /* keySystem */, const String& /* sessionId */) = 0;
     virtual void mediaPlayerKeyError(const String& /* keySystem */, const String& /* sessionId */, MediaKeyErrorCode, unsigned short /* systemCode */) = 0;
     virtual void mediaPlayerKeyMessage(const String& /* keySystem */, const String& /* sessionId */, const unsigned char* /* message */, unsigned /* messageLength */, const KURL& /* defaultURL */) = 0;
     virtual bool mediaPlayerKeyNeeded(const String& /* contentType */, const unsigned char* /* initData */, unsigned /* initDataLength */) = 0;
 
     virtual CORSMode mediaPlayerCORSMode() const = 0;
 
     virtual void mediaPlayerSetWebLayer(blink::WebLayer*) = 0;
     virtual void mediaPlayerSetOpaque(bool) = 0;
 
-    virtual void mediaPlayerDidAddTextTrack(blink::WebInbandTextTrack*) = 0;
-    virtual void mediaPlayerDidRemoveTextTrack(blink::WebInbandTextTrack*) = 0;
+    virtual void mediaPlayerDidAddTrack(blink::WebInbandTextTrack*) = 0;
+    virtual void mediaPlayerDidRemoveTrack(blink::WebInbandTextTrack*) = 0;
 
     virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) = 0;
 };
 
 typedef PassOwnPtr<MediaPlayer> (*CreateMediaEnginePlayer)(MediaPlayerClient*);
 
 class PLATFORM_EXPORT MediaPlayer {
     WTF_MAKE_NONCOPYABLE(MediaPlayer);
 public:
     static PassOwnPtr<MediaPlayer> create(MediaPlayerClient*);
@@ skipping 77 matching lines @@
     enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported, InvalidAccess };
     virtual MediaKeyException addKey(const String&, const unsigned char*, unsigned, const unsigned char*, unsigned, const String&) = 0;
     virtual MediaKeyException generateKeyRequest(const String&, const unsigned char*, unsigned) = 0;
     virtual MediaKeyException cancelKeyRequest(const String&, const String&) = 0;
     virtual void setContentDecryptionModule(blink::WebContentDecryptionModule*) = 0;
 };
 
 }
 
 #endif // MediaPlayer_h