Index: remoting/host/screen_recorder_unittest.cc |
diff --git a/remoting/host/session_manager_unittest.cc b/remoting/host/screen_recorder_unittest.cc |
similarity index 90% |
rename from remoting/host/session_manager_unittest.cc |
rename to remoting/host/screen_recorder_unittest.cc |
index 5c853b28b42c4f54207d3ea9c630a28a6e775af2..d8d33035f825700b41a24b60b77ef2a868cdf6f2 100644 |
--- a/remoting/host/session_manager_unittest.cc |
+++ b/remoting/host/screen_recorder_unittest.cc |
@@ -6,7 +6,7 @@ |
#include "base/task.h" |
#include "remoting/base/mock_objects.h" |
#include "remoting/host/mock_objects.h" |
-#include "remoting/host/session_manager.h" |
+#include "remoting/host/screen_recorder.h" |
#include "remoting/proto/video.pb.h" |
#include "remoting/protocol/mock_objects.h" |
#include "testing/gmock/include/gmock/gmock.h" |
@@ -27,9 +27,9 @@ static const media::VideoFrame::Format kFormat = media::VideoFrame::RGB32; |
static const VideoPacketFormat::Encoding kEncoding = |
VideoPacketFormat::ENCODING_VERBATIM; |
-class SessionManagerTest : public testing::Test { |
+class ScreenRecorderTest : public testing::Test { |
public: |
- SessionManagerTest() { |
+ ScreenRecorderTest() { |
} |
protected: |
@@ -37,21 +37,21 @@ class SessionManagerTest : public testing::Test { |
capturer_ = new MockCapturer(); |
encoder_ = new MockEncoder(); |
connection_ = new MockConnectionToClient(); |
- record_ = new SessionManager( |
+ record_ = new ScreenRecorder( |
&message_loop_, &message_loop_, &message_loop_, |
capturer_, encoder_); |
} |
- scoped_refptr<SessionManager> record_; |
+ scoped_refptr<ScreenRecorder> record_; |
scoped_refptr<MockConnectionToClient> connection_; |
MockCapturer* capturer_; |
MockEncoder* encoder_; |
MessageLoop message_loop_; |
private: |
- DISALLOW_COPY_AND_ASSIGN(SessionManagerTest); |
+ DISALLOW_COPY_AND_ASSIGN(ScreenRecorderTest); |
}; |
-TEST_F(SessionManagerTest, Init) { |
+TEST_F(ScreenRecorderTest, Init) { |
Init(); |
dmac
2010/11/17 16:37:54
why do we use Init() instead of SetUp?
|
} |
@@ -72,7 +72,7 @@ ACTION_P(FinishEncode, msg) { |
} |
// BUG 57351 |
-TEST_F(SessionManagerTest, DISABLED_OneRecordCycle) { |
+TEST_F(ScreenRecorderTest, OneRecordCycle) { |
Init(); |
InvalidRects update_rects; |