summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authormikhal@google.com <mikhal@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 08:51:53 +0000
committermikhal@google.com <mikhal@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 08:51:53 +0000
commitbd12466d81f8ddac49cf0bc513e806f69d07969e (patch)
tree242707bebf185f6bb56f24a17a42435c43134da0 /media
parent89803dfad2d9e4e189116a71ab8901ae58afdb48 (diff)
downloadchromium_src-bd12466d81f8ddac49cf0bc513e806f69d07969e.zip
chromium_src-bd12466d81f8ddac49cf0bc513e806f69d07969e.tar.gz
chromium_src-bd12466d81f8ddac49cf0bc513e806f69d07969e.tar.bz2
Cast:Adding namespace to internal test members
This is a follow-up on previous cl's: adding namespace where missing, and some consts while at it. Review URL: https://codereview.chromium.org/62453003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/cast/audio_receiver/audio_receiver_unittest.cc4
-rw-r--r--media/cast/framer/cast_message_builder_unittest.cc2
-rw-r--r--media/cast/rtcp/rtcp_receiver_unittest.cc5
-rw-r--r--media/cast/rtcp/rtcp_sender_unittest.cc2
-rw-r--r--media/cast/video_receiver/video_receiver_unittest.cc6
-rw-r--r--media/cast/video_sender/video_encoder_unittest.cc2
-rw-r--r--media/cast/video_sender/video_sender_unittest.cc2
7 files changed, 17 insertions, 6 deletions
diff --git a/media/cast/audio_receiver/audio_receiver_unittest.cc b/media/cast/audio_receiver/audio_receiver_unittest.cc
index cbd90c1..474e8b2 100644
--- a/media/cast/audio_receiver/audio_receiver_unittest.cc
+++ b/media/cast/audio_receiver/audio_receiver_unittest.cc
@@ -19,6 +19,7 @@ namespace cast {
static const int64 kStartMillisecond = GG_INT64_C(12345678900000);
+namespace {
class TestAudioEncoderCallback :
public base::RefCountedThreadSafe<TestAudioEncoderCallback> {
public:
@@ -39,7 +40,7 @@ class TestAudioEncoderCallback :
num_called_++;
}
- int number_times_called() { return num_called_;}
+ int number_times_called() const { return num_called_;}
protected:
virtual ~TestAudioEncoderCallback() {}
@@ -51,6 +52,7 @@ class TestAudioEncoderCallback :
uint8 expected_frame_id_;
base::TimeTicks expected_playout_time_;
};
+} // namespace
class PeerAudioReceiver : public AudioReceiver {
public:
diff --git a/media/cast/framer/cast_message_builder_unittest.cc b/media/cast/framer/cast_message_builder_unittest.cc
index 5bb38f7..99c07eb 100644
--- a/media/cast/framer/cast_message_builder_unittest.cc
+++ b/media/cast/framer/cast_message_builder_unittest.cc
@@ -17,6 +17,7 @@ static const uint32 kShortTimeIncrementMs = 10;
static const uint32 kLongTimeIncrementMs = 40;
static const int64 kStartMillisecond = GG_INT64_C(12345678900000);
+namespace {
typedef std::map<uint8, size_t> MissingPacketsMap;
class NackFeedbackVerification : public RtpPayloadFeedback {
@@ -74,6 +75,7 @@ class NackFeedbackVerification : public RtpPayloadFeedback {
MissingPacketsMap missing_packets_; // Missing packets per frame.
uint8 last_frame_acked_;
};
+} // namespace
class CastMessageBuilderTest : public ::testing::Test {
protected:
diff --git a/media/cast/rtcp/rtcp_receiver_unittest.cc b/media/cast/rtcp/rtcp_receiver_unittest.cc
index 7062df0..d432a33 100644
--- a/media/cast/rtcp/rtcp_receiver_unittest.cc
+++ b/media/cast/rtcp/rtcp_receiver_unittest.cc
@@ -20,6 +20,7 @@ static const uint32 kSourceSsrc = 0x40506;
static const uint32 kUnknownSsrc = 0xDEAD;
static const std::string kCName("test@10.1.1.1");
+namespace {
class SenderFeedbackCastVerification : public RtcpSenderFeedback {
public:
SenderFeedbackCastVerification() : called_(false) {}
@@ -58,12 +59,12 @@ class SenderFeedbackCastVerification : public RtcpSenderFeedback {
called_ = true;
}
- bool called() { return called_; }
+ bool called() const { return called_; }
private:
bool called_;
};
-
+} // namespace
class RtcpReceiverTest : public ::testing::Test {
protected:
diff --git a/media/cast/rtcp/rtcp_sender_unittest.cc b/media/cast/rtcp/rtcp_sender_unittest.cc
index c8c2f17..ccbb82f 100644
--- a/media/cast/rtcp/rtcp_sender_unittest.cc
+++ b/media/cast/rtcp/rtcp_sender_unittest.cc
@@ -43,7 +43,7 @@ class TestRtcpTransport : public PacedPacketSender {
memcpy(expected_packet_, rtcp_buffer, length);
}
- int packet_count() { return packet_count_; }
+ int packet_count() const { return packet_count_; }
private:
uint8 expected_packet_[kIpPacketSize];
diff --git a/media/cast/video_receiver/video_receiver_unittest.cc b/media/cast/video_receiver/video_receiver_unittest.cc
index 31c5bdd..0a8df04 100644
--- a/media/cast/video_receiver/video_receiver_unittest.cc
+++ b/media/cast/video_receiver/video_receiver_unittest.cc
@@ -21,7 +21,8 @@ namespace cast {
using testing::_;
-// was thread counted thread safe.
+namespace {
+// Was thread counted thread safe.
class TestVideoReceiverCallback :
public base::RefCountedThreadSafe<TestVideoReceiverCallback> {
public:
@@ -41,7 +42,7 @@ class TestVideoReceiverCallback :
++num_called_;
}
- int number_times_called() { return num_called_;}
+ int number_times_called() const { return num_called_;}
protected:
virtual ~TestVideoReceiverCallback() {}
@@ -51,6 +52,7 @@ class TestVideoReceiverCallback :
int num_called_;
};
+} // namespace
class PeerVideoReceiver : public VideoReceiver {
public:
diff --git a/media/cast/video_sender/video_encoder_unittest.cc b/media/cast/video_sender/video_encoder_unittest.cc
index 10391f2..a68db22 100644
--- a/media/cast/video_sender/video_encoder_unittest.cc
+++ b/media/cast/video_sender/video_encoder_unittest.cc
@@ -22,6 +22,7 @@ static void ReleaseFrame(const I420VideoFrame* frame) {
// Empty since we in this test send in the same frame.
}
+namespace {
class TestVideoEncoderCallback :
public base::RefCountedThreadSafe<TestVideoEncoderCallback> {
public:
@@ -57,6 +58,7 @@ class TestVideoEncoderCallback :
uint8 expected_last_referenced_frame_id_;
base::TimeTicks expected_capture_time_;
};
+} // namespace
class VideoEncoderTest : public ::testing::Test {
protected:
diff --git a/media/cast/video_sender/video_sender_unittest.cc b/media/cast/video_sender/video_sender_unittest.cc
index 46a1138..dd232a2 100644
--- a/media/cast/video_sender/video_sender_unittest.cc
+++ b/media/cast/video_sender/video_sender_unittest.cc
@@ -24,6 +24,7 @@ static const uint8 kPixelValue = 123;
using testing::_;
+namespace {
class PeerVideoSender : public VideoSender {
public:
PeerVideoSender(scoped_refptr<CastEnvironment> cast_environment,
@@ -46,6 +47,7 @@ static void ReleaseVideoFrame(const I420VideoFrame* frame) {
static void ReleaseEncodedFrame(const EncodedVideoFrame* frame) {
// Do nothing.
}
+} // namespace
class VideoSenderTest : public ::testing::Test {
protected: