| Index: media/base/mock_media_filters.h
|
| diff --git a/media/base/mock_media_filters.h b/media/base/mock_media_filters.h
|
| index 1d215c408ab07dbb8bbf450507ed3440724696cb..b8a8f74bdb55341a857a56d1b88618ae76fa7f4b 100644
|
| --- a/media/base/mock_media_filters.h
|
| +++ b/media/base/mock_media_filters.h
|
| @@ -1,6 +1,11 @@
|
| // Copyright (c) 2009 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.
|
| +//
|
| +// TODO(ajwong): This whole file is deprecated in favor or gmock style mocks.
|
| +// The deprecated classes have been moved into the old_mocks to avoid colliding
|
| +// with the newer mock classes. Once all the unittests have been migrated, this
|
| +// should be deleted.
|
|
|
| #ifndef MEDIA_BASE_MOCK_MEDIA_FILTERS_H_
|
| #define MEDIA_BASE_MOCK_MEDIA_FILTERS_H_
|
| @@ -20,6 +25,8 @@
|
|
|
| namespace media {
|
|
|
| +namespace old_mocks {
|
| +
|
| // Behaviors for MockDataSource filter.
|
| enum MockDataSourceBehavior {
|
| MOCK_DATA_SOURCE_NORMAL_INIT,
|
| @@ -667,6 +674,8 @@ class InitializationHelper {
|
| DISALLOW_COPY_AND_ASSIGN(InitializationHelper);
|
| };
|
|
|
| +} // namespace old_mocks
|
| +
|
| } // namespace media
|
|
|
| #endif // MEDIA_BASE_MOCK_MEDIA_FILTERS_H_
|
|
|