Revert 66125 -- Broke Windows build - Move FilterType into MediaFilterCollect...

media/filters/decoder_base_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "media/base/mock_filters.h"
 #include "media/base/mock_task.h"
 #include "media/filters/decoder_base.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 49 matching lines @@
 
 class MockDecoderImpl : public media::DecoderBase<
   MockDecoder, MockDecoderOutput> {
  public:
   MockDecoderImpl() {
     media_format_.SetAsString(media::MediaFormat::kMimeType, "mock");
   }
 
   virtual ~MockDecoderImpl() {}
 
+  virtual media::FilterType filter_type() const {
+    return media::FILTER_VIDEO_DECODER;
+  }
+
   // DecoderBase Implementations.
   MOCK_METHOD3(DoInitialize,
                void(media::DemuxerStream* demuxer_stream,
                     bool* success,
                     Task* done_cb));
   MOCK_METHOD1(DoStop, void(Task* done_cb));
   MOCK_METHOD2(DoSeek, void(base::TimeDelta time, Task* done_cb));
   MOCK_METHOD1(DoDecode, void(media::Buffer* input));
 
  private:
@@ skipping 77 matching lines @@
   // Stop.
   EXPECT_CALL(*decoder, DoStop(_))
       .WillOnce(WithArg<0>(InvokeRunnable()));
   EXPECT_CALL(callback, OnFilterCallback());
   EXPECT_CALL(callback, OnCallbackDestroyed());
   decoder->Stop(callback.NewCallback());
   message_loop.RunAllPending();
 }
 
 }  // namespace media