Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Unified Diff: remoting/host/video_frame_capturer_unittest.cc

Issue 10825302: mac: Remove more 10.5-only code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweak comments Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/plugin/daemon_controller_mac.cc ('k') | ui/base/cocoa/underlay_opengl_hosting_window.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/video_frame_capturer_unittest.cc
diff --git a/remoting/host/video_frame_capturer_unittest.cc b/remoting/host/video_frame_capturer_unittest.cc
index 306c6ba1225ef56a6e7f85eeed8b41b8222520eb..4ad0a1b8ca5a937056883a01a6823f0cc49da4fa 100644
--- a/remoting/host/video_frame_capturer_unittest.cc
+++ b/remoting/host/video_frame_capturer_unittest.cc
@@ -18,16 +18,6 @@ namespace remoting {
namespace {
-bool IsOsSupported() {
-#if defined(OS_MACOSX)
- // Verify that the OS is at least Snow Leopard (10.6).
- // Chromoting doesn't support 10.5 or earlier.
- return base::mac::IsOSSnowLeopardOrLater();
-#else
- return true;
-#endif
-}
-
void IgnoreCursorShapeChanged(scoped_ptr<protocol::CursorShapeInfo> info) {
}
@@ -53,19 +43,11 @@ class VideoFrameCapturerTest : public testing::Test {
};
TEST_F(VideoFrameCapturerTest, StartCapturer) {
- if (!IsOsSupported()) {
- return;
- }
-
capturer_->Start(base::Bind(&IgnoreCursorShapeChanged));
capturer_->Stop();
}
TEST_F(VideoFrameCapturerTest, Capture) {
- if (!IsOsSupported()) {
- return;
- }
-
// Assume that Start() treats the screen as invalid initially.
EXPECT_CALL(capture_completed_callback_,
CaptureCompletedPtr(DirtyRegionIsNonEmptyRect()));
« no previous file with comments | « remoting/host/plugin/daemon_controller_mac.cc ('k') | ui/base/cocoa/underlay_opengl_hosting_window.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698