Rename SessionManager to ScreenRecorder

remoting/host/screen_recorder_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::remoting::protocol::MockConnectionToClient;
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::NotNull;
 using ::testing::Return;
 
 namespace remoting {
 
 static const int kWidth = 640;
 static const int kHeight = 480;
 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:
-  void Init() {
+  virtual void SetUp() {
     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_;
+ protected:
+  scoped_refptr<ScreenRecorder> record_;
   scoped_refptr<MockConnectionToClient> connection_;
   MockCapturer* capturer_;

[dmac, 2010/11/17 21:58:19]

what's the ownership on these guys? It looks like a leak in SetUp.

[Alpha Left Google, 2010/11/19 23:19:22]

capturer_ and encoder_ are deleted by ScreenRecorder. Added comment for that.

   MockEncoder* encoder_;
   MessageLoop message_loop_;
  private:
-  DISALLOW_COPY_AND_ASSIGN(SessionManagerTest);
+  DISALLOW_COPY_AND_ASSIGN(ScreenRecorderTest);
 };
 
-TEST_F(SessionManagerTest, Init) {
-  Init();
-}
-
 ACTION_P2(RunCallback, rects, data) {
   InvalidRects& dirty_rects = data->mutable_dirty_rects();
   InvalidRects temp_rects;
   std::set_union(dirty_rects.begin(), dirty_rects.end(),
                  rects.begin(), rects.end(),
                  std::inserter(temp_rects, temp_rects.begin()));
   dirty_rects.swap(temp_rects);
   arg0->Run(data);
   delete arg0;
 }
 
 ACTION_P(FinishEncode, msg) {
   arg2->Run(msg);
   delete arg2;
 }
 
-// BUG 57351
-TEST_F(SessionManagerTest, DISABLED_OneRecordCycle) {
-  Init();
-
+TEST_F(ScreenRecorderTest, OneRecordCycle) {
   InvalidRects update_rects;
   update_rects.insert(gfx::Rect(0, 0, 10, 10));
   DataPlanes planes;
   for (int i = 0; i < DataPlanes::kPlaneCount; ++i) {
     planes.data[i] = reinterpret_cast<uint8*>(i);
     planes.strides[i] = kWidth * 4;
   }
   scoped_refptr<CaptureData> data(new CaptureData(planes, kWidth,
                                                   kHeight, kFormat));
   // Set the recording rate to very low to avoid capture twice.
@@ skipping 24 matching lines @@
 
   // Make sure all tasks are completed.
   message_loop_.RunAllPending();
 }
 
 // TODO(hclam): Add test for double buffering.
 // TODO(hclam): Add test for multiple captures.
 // TODO(hclam): Add test for interruption.
 
 }  // namespace remoting