diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 16:40:40 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 16:40:40 +0000 |
| commit | 5a40f6beda09a0f259c7c4b7aa249e26612c5285 (patch) | |
| tree | 8e1e496b52010d7463a10695ea917110df4fbe20 /media/base | |
| parent | 3dda5b0f1bb73a437ca6e6f2741580451030ac25 (diff) | |
| download | chromium_src-5a40f6beda09a0f259c7c4b7aa249e26612c5285.zip chromium_src-5a40f6beda09a0f259c7c4b7aa249e26612c5285.tar.gz chromium_src-5a40f6beda09a0f259c7c4b7aa249e26612c5285.tar.bz2 | |
GTTF: more FRIEND_TEST_ALL_PREFIXES
TEST=compile
BUG=44549
Review URL: http://codereview.chromium.org/3064007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/pipeline_impl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/base/pipeline_impl.h b/media/base/pipeline_impl.h index 92bec7a..a590b47 100644 --- a/media/base/pipeline_impl.h +++ b/media/base/pipeline_impl.h @@ -11,6 +11,7 @@ #include <string> #include <vector> +#include "base/gtest_prod_util.h" #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" @@ -19,7 +20,6 @@ #include "media/base/clock_impl.h" #include "media/base/filter_host.h" #include "media/base/pipeline.h" -#include "testing/gtest/include/gtest/gtest_prod.h" namespace media { @@ -414,7 +414,8 @@ class PipelineImpl : public Pipeline, public FilterHost { typedef std::vector<base::Thread*> FilterThreadVector; FilterThreadVector filter_threads_; - FRIEND_TEST(PipelineImplTest, GetBufferedTime); + FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, GetBufferedTime); + DISALLOW_COPY_AND_ASSIGN(PipelineImpl); }; |