| Index: media/base/mock_filters.h
|
| diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
|
| index 681a8c6fa3a042fca58ba9df86a4f6a795e2d6ef..56b523a65e7b6a82ecda6584f5c2b63fecce4c9f 100644
|
| --- a/media/base/mock_filters.h
|
| +++ b/media/base/mock_filters.h
|
| @@ -1,13 +1,6 @@
|
| // Copyright (c) 2012 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.
|
| -//
|
| -// A new breed of mock media filters, this time using gmock! Feel free to add
|
| -// actions if you need interesting side-effects.
|
| -//
|
| -// Don't forget you can use StrictMock<> and NiceMock<> if you want the mock
|
| -// filters to fail the test or do nothing when an unexpected method is called.
|
| -// http://code.google.com/p/googlemock/wiki/CookBook#Nice_Mocks_and_Strict_Mocks
|
|
|
| #ifndef MEDIA_BASE_MOCK_FILTERS_H_
|
| #define MEDIA_BASE_MOCK_FILTERS_H_
|
| @@ -31,27 +24,6 @@
|
|
|
| namespace media {
|
|
|
| -// Use this template to test for object destruction by setting expectations on
|
| -// the method OnDestroy().
|
| -//
|
| -// TODO(scherkus): not sure about the naming... perhaps contribute this back
|
| -// to gmock itself!
|
| -template<class MockClass>
|
| -class Destroyable : public MockClass {
|
| - public:
|
| - Destroyable() {}
|
| -
|
| - MOCK_METHOD0(OnDestroy, void());
|
| -
|
| - protected:
|
| - virtual ~Destroyable() {
|
| - OnDestroy();
|
| - }
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(Destroyable);
|
| -};
|
| -
|
| class MockDemuxer : public Demuxer {
|
| public:
|
| MockDemuxer();
|
|
|