Remove a bunch of dead fields found by Scythe.

Review URL: https://chromiumcodereview.appspot.com/10825108

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149251 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 12 insertions, 34 deletions

diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc
index e0850c4..58cb5a3 100644
--- a/media/audio/audio_input_controller_unittest.cc
+++ b/media/audio/audio_input_controller_unittest.cc
@@ -21,7 +21,6 @@ namespace media {
 
 static const int kSampleRate = AudioParameters::kAudioCDSampleRate;
 static const int kBitsPerSample = 16;
-static const int kChannels = 2;
 static const ChannelLayout kChannelLayout = CHANNEL_LAYOUT_STEREO;
 static const int kSamplesPerPacket = kSampleRate / 10;
 
diff --git a/media/audio/audio_parameters.h b/media/audio/audio_parameters.h
index 8ce2070..01d8869 100644
--- a/media/audio/audio_parameters.h
+++ b/media/audio/audio_parameters.h
@@ -39,12 +39,12 @@ class MEDIA_EXPORT AudioParameters {
     AUDIO_LAST_FORMAT         // Only used for validation of format.y
   };
 
-  // Telephone quality sample rate, mostly for speech-only audio.
-  static const uint32 kTelephoneSampleRate = 8000;
-  // CD sampling rate is 44.1 KHz or conveniently 2x2x3x3x5x5x7x7.
-  static const uint32 kAudioCDSampleRate = 44100;
-  // Digital Audio Tape sample rate.
-  static const uint32 kAudioDATSampleRate = 48000;
+  enum {
+    // Telephone quality sample rate, mostly for speech-only audio.
+    kTelephoneSampleRate = 8000,
+    // CD sampling rate is 44.1 KHz or conveniently 2x2x3x3x5x5x7x7.
+    kAudioCDSampleRate = 44100,
+  };
 
   AudioParameters();
   AudioParameters(Format format, ChannelLayout channel_layout,
diff --git a/media/audio/cross_process_notification_unittest.cc b/media/audio/cross_process_notification_unittest.cc
index a5ff7b0..a0392c2 100644
--- a/media/audio/cross_process_notification_unittest.cc
+++ b/media/audio/cross_process_notification_unittest.cc
@@ -115,7 +115,6 @@ class MultiNotifierWorker : public base::PlatformThread::Delegate {
   size_t* shared_data_;
   size_t repeats_;
   const CrossProcessNotification::Notifications* notifiers_;
-  size_t count_;
   DISALLOW_COPY_AND_ASSIGN(MultiNotifierWorker);
 };
 
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index 1ff12c2..6fd6172 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -34,7 +34,6 @@ namespace media {
 
 // Demuxer properties.
 static const int kTotalBytes = 1024;
-static const int kBufferedBytes = 1024;
 static const int kBitrate = 1234;
 
 ACTION_P(SetDemuxerProperties, duration) {
diff --git a/media/base/simd/convert_yuv_to_rgb_c.cc b/media/base/simd/convert_yuv_to_rgb_c.cc
index abd7bfc..db6e557 100644
--- a/media/base/simd/convert_yuv_to_rgb_c.cc
+++ b/media/base/simd/convert_yuv_to_rgb_c.cc
@@ -39,11 +39,6 @@ static inline void ConvertYUVToRGB32_C(uint8 y,
                                         (packuswb(a) << 24);
 }
 
-// 16.16 fixed point arithmetic
-const int kFractionBits = 16;
-const int kFractionMax = 1 << kFractionBits;
-const int kFractionMask = ((1 << kFractionBits) - 1);
-
 extern "C" {
 
 void ConvertYUVToRGB32Row_C(const uint8* y_buf,
diff --git a/media/filters/dummy_demuxer.cc b/media/filters/dummy_demuxer.cc
index 66bc5ba..317b543 100644
--- a/media/filters/dummy_demuxer.cc
+++ b/media/filters/dummy_demuxer.cc
@@ -36,9 +36,7 @@ Ranges<base::TimeDelta> DummyDemuxerStream::GetBufferedRanges() {
   return Ranges<base::TimeDelta>();
 }
 
-DummyDemuxer::DummyDemuxer(bool has_video, bool has_audio)
-    : has_video_(has_video),
-      has_audio_(has_audio) {
+DummyDemuxer::DummyDemuxer(bool has_video, bool has_audio) {
   streams_.resize(DemuxerStream::NUM_TYPES);
   if (has_audio)
     streams_[DemuxerStream::AUDIO] =
diff --git a/media/filters/dummy_demuxer.h b/media/filters/dummy_demuxer.h
index f638e5f..c8c1b5e 100644
--- a/media/filters/dummy_demuxer.h
+++ b/media/filters/dummy_demuxer.h
@@ -56,8 +56,6 @@ class MEDIA_EXPORT DummyDemuxer : public Demuxer {
   virtual ~DummyDemuxer();
 
  private:
-  bool has_video_;
-  bool has_audio_;
   std::vector< scoped_refptr<DummyDemuxerStream> > streams_;
 
   DISALLOW_COPY_AND_ASSIGN(DummyDemuxer);
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 5912e83..cb6494a 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -35,7 +35,6 @@ FFmpegDemuxerStream::FFmpegDemuxerStream(
     : demuxer_(demuxer),
       stream_(stream),
       type_(UNKNOWN),
-      discontinuous_(false),
       stopped_(false),
       last_packet_timestamp_(kNoTimestamp()) {
   DCHECK(demuxer_);
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index a80d9c5..b90cbbb 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -114,7 +114,6 @@ class FFmpegDemuxerStream : public DemuxerStream {
   VideoDecoderConfig video_config_;
   Type type_;
   base::TimeDelta duration_;
-  bool discontinuous_;
   bool stopped_;
   base::TimeDelta last_packet_timestamp_;
   Ranges<base::TimeDelta> buffered_ranges_;
diff --git a/media/tools/tile_render_bench/tile_render_bench.cc b/media/tools/tile_render_bench/tile_render_bench.cc
index c067ca3..d5b7e29 100644
--- a/media/tools/tile_render_bench/tile_render_bench.cc
+++ b/media/tools/tile_render_bench/tile_render_bench.cc
@@ -35,7 +35,6 @@ static const int kMaxTextures = kStartSize * kStartSize / kEndSize / kEndSize;
 
 Display* g_display = NULL;
 Window g_window = 0;
-bool g_running = false;
 GLXContext g_gl_context = NULL;
 GLuint g_textures[kMaxTextures];
 scoped_array<uint8> g_image;
diff --git a/media/webm/webm_cluster_parser.h b/media/webm/webm_cluster_parser.h
index 926e6a1..bbcbf37 100644
--- a/media/webm/webm_cluster_parser.h
+++ b/media/webm/webm_cluster_parser.h
@@ -19,10 +19,6 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
 
-  // Size is defined by the WebM encryption specification.
-  // http://wiki.webmproject.org/encryption/webm-encryption-rfc
-  static const int kIvSize = 8;
-
   WebMClusterParser(int64 timecode_scale,
                     int audio_track_num,
                     int video_track_num,
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc
index f27f7e7..5119d1e 100644
--- a/media/webm/webm_stream_parser.cc
+++ b/media/webm/webm_stream_parser.cc
@@ -327,7 +327,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
   cur_size -= result;
   bytes_parsed += result;
 
-  WebMTracksParser tracks_parser(info_parser.timecode_scale());
+  WebMTracksParser tracks_parser;
   result = tracks_parser.Parse(cur, cur_size);
 
   if (result <= 0)
diff --git a/media/webm/webm_tracks_parser.cc b/media/webm/webm_tracks_parser.cc
index 77cb0d0..29c8f2f 100644
--- a/media/webm/webm_tracks_parser.cc
+++ b/media/webm/webm_tracks_parser.cc
@@ -16,9 +16,8 @@ namespace media {
 static const int kWebMTrackTypeVideo = 1;
 static const int kWebMTrackTypeAudio = 2;
 
-WebMTracksParser::WebMTracksParser(int64 timecode_scale)
-    : timecode_scale_(timecode_scale),
-      track_type_(-1),
+WebMTracksParser::WebMTracksParser()
+    : track_type_(-1),
       track_num_(-1),
       audio_track_num_(-1),
       video_track_num_(-1) {
diff --git a/media/webm/webm_tracks_parser.h b/media/webm/webm_tracks_parser.h
index 8b8cb32..ec7b790 100644
--- a/media/webm/webm_tracks_parser.h
+++ b/media/webm/webm_tracks_parser.h
@@ -16,7 +16,7 @@ namespace media {
 // Parser for WebM Tracks element.
 class WebMTracksParser : public WebMParserClient {
  public:
-  explicit WebMTracksParser(int64 timecode_scale);
+  explicit WebMTracksParser();
   virtual ~WebMTracksParser();
 
   // Parses a WebM Tracks element in |buf|.
@@ -41,8 +41,6 @@ class WebMTracksParser : public WebMParserClient {
   virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE;
   virtual bool OnString(int id, const std::string& str) OVERRIDE;
 
-  int64 timecode_scale_;
-
   int64 track_type_;
   int64 track_num_;
   scoped_ptr<WebMContentEncodingsClient> track_content_encodings_client_;
@@ -53,7 +51,7 @@ class WebMTracksParser : public WebMParserClient {
   int64 video_track_num_;
   scoped_ptr<WebMContentEncodingsClient> video_content_encodings_client_;
 
-  DISALLOW_IMPLICIT_CONSTRUCTORS(WebMTracksParser);
+  DISALLOW_COPY_AND_ASSIGN(WebMTracksParser);
 };
 
 }  // namespace media