diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 00:34:04 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 00:34:04 +0000 |
| commit | 34f40946dab92acf2c0b25c067e14bc438c1e676 (patch) | |
| tree | 236343b5e718f6f88a88946c1b8a2c4697b790f8 /remoting | |
| parent | 74e3af7013e7fb3ae9a9cbd98a7fcaf8469b1b0d (diff) | |
| download | chromium_src-34f40946dab92acf2c0b25c067e14bc438c1e676.zip chromium_src-34f40946dab92acf2c0b25c067e14bc438c1e676.tar.gz chromium_src-34f40946dab92acf2c0b25c067e14bc438c1e676.tar.bz2 | |
clang/mac: Fix almost all problems when building all.xcodeproj.
BUG=None
TEST=None
TBR=hans
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/chromoting_view_unittest.cc | 10 | ||||
| -rw-r--r-- | remoting/host/capturer_mac_unittest.cc | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/remoting/client/chromoting_view_unittest.cc b/remoting/client/chromoting_view_unittest.cc index 1856891..4301e5a 100644 --- a/remoting/client/chromoting_view_unittest.cc +++ b/remoting/client/chromoting_view_unittest.cc @@ -107,7 +107,7 @@ TEST(ChromotingViewTest, DecodeSimple) { Decoder* decoder = view->get_decoder(); ASSERT_TRUE(decoder != NULL); EXPECT_EQ(EncodingZlib, decoder->Encoding()); - EXPECT_EQ(false, decoder->IsStarted()); + EXPECT_FALSE(decoder->IsStarted()); // Overwrite |decoder_| with MockDecoder. MockDecoder* mock_decoder = new MockDecoder(); @@ -176,7 +176,7 @@ TEST(ChromotingViewTest, DecodeThreePackets) { Decoder* decoder = view->get_decoder(); ASSERT_TRUE(decoder != NULL); EXPECT_EQ(EncodingZlib, decoder->Encoding()); - EXPECT_EQ(false, decoder->IsStarted()); + EXPECT_FALSE(decoder->IsStarted()); // Overwrite |decoder_| with MockDecoder. MockDecoder* mock_decoder = new MockDecoder(); @@ -265,7 +265,7 @@ TEST(ChromotingViewTest, DecodeTwoStreams) { Decoder* decoder = view->get_decoder(); ASSERT_TRUE(decoder != NULL); EXPECT_EQ(EncodingZlib, decoder->Encoding()); - EXPECT_EQ(false, decoder->IsStarted()); + EXPECT_FALSE(decoder->IsStarted()); // Overwrite |decoder_| with MockDecoder. MockDecoder* mock_decoder = new MockDecoder(); @@ -373,7 +373,7 @@ TEST(ChromotingViewTest, DecodeTwoStreamsDifferentEncodings) { Decoder* decoder = view->get_decoder(); ASSERT_TRUE(decoder != NULL); EXPECT_EQ(EncodingZlib, decoder->Encoding()); - EXPECT_EQ(false, decoder->IsStarted()); + EXPECT_FALSE(decoder->IsStarted()); // Overwrite |decoder_| with MockDecoder. MockDecoder* mock_decoder1 = new MockDecoder(); @@ -489,7 +489,7 @@ TEST(ChromotingViewTest, MismatchedEncodings) { Decoder* decoder = view->get_decoder(); ASSERT_TRUE(decoder != NULL); EXPECT_EQ(EncodingZlib, decoder->Encoding()); - EXPECT_EQ(false, decoder->IsStarted()); + EXPECT_FALSE(decoder->IsStarted()); // Overwrite |decoder_| with MockDecoder. MockDecoder* mock_decoder = new MockDecoder(); diff --git a/remoting/host/capturer_mac_unittest.cc b/remoting/host/capturer_mac_unittest.cc index 937d2bd..8305b3a 100644 --- a/remoting/host/capturer_mac_unittest.cc +++ b/remoting/host/capturer_mac_unittest.cc @@ -67,6 +67,8 @@ TEST_F(CapturerMacTest, Capture) { } // namespace remoting +namespace gfx { + std::ostream& operator<<(std::ostream& out, const remoting::InvalidRects& rects) { for (remoting::InvalidRects::const_iterator i = rects.begin(); @@ -76,3 +78,6 @@ std::ostream& operator<<(std::ostream& out, } return out; } + +} // namespace gfx + |