Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f

1 files changed, 1 insertions, 3 deletions

diff --git a/media/filters/file_data_source.h b/media/filters/file_data_source.h
index 85e6f6c2a0..e55ecdf021 100644
--- a/media/filters/file_data_source.h
+++ b/media/filters/file_data_source.h
@@ -18,6 +18,7 @@ namespace media {
 class MEDIA_EXPORT FileDataSource : public DataSource {
  public:
   FileDataSource();
+  virtual ~FileDataSource();
 
   bool Initialize(const base::FilePath& file_path);
 
@@ -34,9 +35,6 @@ class MEDIA_EXPORT FileDataSource : public DataSource {
   void force_read_errors_for_testing() { force_read_errors_ = true; }
   void force_streaming_for_testing() { force_streaming_ = true; }
 
- protected:
-  virtual ~FileDataSource();
-
  private:
   // Informs the host of changes in total and buffered bytes.
   void UpdateHostBytes();