diff --git a/webrtc/test/testsupport/frame_reader.h b/webrtc/test/testsupport/frame_reader.h
index 13800cd..94dd78b 100644
--- a/webrtc/test/testsupport/frame_reader.h
+++ b/webrtc/test/testsupport/frame_reader.h
@@ -46,14 +46,14 @@
   virtual int NumberOfFrames() = 0;
 };
 
-class FrameReaderImpl : public FrameReader {
+class YuvFrameReaderImpl : public FrameReader {
  public:
   // Creates a file handler. The input file is assumed to exist and be readable.
   // Parameters:
   //   input_filename          The file to read from.
   //   width, height           Size of each frame to read.
-  FrameReaderImpl(std::string input_filename, int width, int height);
-  ~FrameReaderImpl() override;
+  YuvFrameReaderImpl(std::string input_filename, int width, int height);
+  ~YuvFrameReaderImpl() override;
   bool Init() override;
   rtc::scoped_refptr<I420Buffer> ReadFrame() override;
   void Close() override;
@@ -61,10 +61,10 @@
   int NumberOfFrames() override;
 
  private:
-  std::string input_filename_;
+  const std::string input_filename_;
   size_t frame_length_in_bytes_;
-  int width_;
-  int height_;
+  const int width_;
+  const int height_;
   int number_of_frames_;
   FILE* input_file_;
 };