summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 18:54:17 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 18:54:17 +0000
commitb3e1bc055de885a92f7f148f9136bf1570581518 (patch)
treef8369389ccc2ac3127ee4eb29340c99210a7deb8 /content
parent9ce7cb4c378d6ac673abfd8c136960424f8308bb (diff)
downloadchromium_src-b3e1bc055de885a92f7f148f9136bf1570581518.zip
chromium_src-b3e1bc055de885a92f7f148f9136bf1570581518.tar.gz
chromium_src-b3e1bc055de885a92f7f148f9136bf1570581518.tar.bz2
Replace media::Limits struct with media::limits namespace and update documentation.
Review URL: http://codereview.chromium.org/8786013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/media/rtc_video_decoder.cc1
-rw-r--r--content/renderer/media/rtc_video_decoder_unittest.cc3
2 files changed, 1 insertions, 3 deletions
diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc
index b9815e8..4f418a5 100644
--- a/content/renderer/media/rtc_video_decoder.cc
+++ b/content/renderer/media/rtc_video_decoder.cc
@@ -22,7 +22,6 @@ using media::CopyYPlane;
using media::DemuxerStream;
using media::FilterStatusCB;
using media::kNoTimestamp;
-using media::Limits;
using media::PIPELINE_OK;
using media::StatisticsCallback;
using media::VideoDecoder;
diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc
index 903cfc3..73d2bb4 100644
--- a/content/renderer/media/rtc_video_decoder_unittest.cc
+++ b/content/renderer/media/rtc_video_decoder_unittest.cc
@@ -30,7 +30,6 @@ using ::testing::SetArgumentPointee;
using ::testing::StrictMock;
using ::testing::WithArg;
using ::testing::Invoke;
-using media::Limits;
using media::MockStatisticsCallback;
using media::MockVideoRenderer;
using media::MockFilterHost;
@@ -205,7 +204,7 @@ TEST_F(RTCVideoDecoderTest, DoRenderFrame) {
NullVideoFrame video_frame;
- for (size_t i = 0; i < Limits::kMaxVideoFrames; ++i) {
+ for (size_t i = 0; i < media::limits::kMaxVideoFrames; ++i) {
decoder_->RenderFrame(&video_frame);
}