Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/chromeos/aura_screen_capturer_unittest.cc

Index: remoting/host/chromeos/aura_screen_capturer_unittest.cc
diff --git a/remoting/host/chromeos/aura_desktop_capturer_unittest.cc b/remoting/host/chromeos/aura_screen_capturer_unittest.cc
similarity index 86%
rename from remoting/host/chromeos/aura_desktop_capturer_unittest.cc
rename to remoting/host/chromeos/aura_screen_capturer_unittest.cc
index 08139a9d4dd7ed22ada5e05d1da96eb4b0a92e61..129521acd87670257a981ba467466845ea67b5d9 100644
--- a/remoting/host/chromeos/aura_desktop_capturer_unittest.cc
+++ b/remoting/host/chromeos/aura_screen_capturer_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/host/chromeos/aura_desktop_capturer.h"
+#include "remoting/host/chromeos/aura_screen_capturer.h"
 
 #include "cc/output/copy_output_result.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -34,10 +34,10 @@ const unsigned char frame_data[] = {
   };
 }  // namespace
 
-class AuraDesktopCapturerTest : public testing::Test,
+class AuraScreenCapturerTest : public testing::Test,
                                 public webrtc::DesktopCapturer::Callback {
  public:
-  AuraDesktopCapturerTest() {}
+  AuraScreenCapturerTest() {}
 
   virtual void SetUp() override;
 
@@ -48,7 +48,7 @@ class AuraDesktopCapturerTest : public testing::Test,
   void SimulateFrameCapture() {
     scoped_ptr<SkBitmap> bitmap(new SkBitmap());
     const SkImageInfo& info =
-        SkImageInfo::Make(3, 4, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
+        SkImageInfo::Make(3, 4, kBGRA_8888_SkColorType, kPremul_SkAlphaType);
     bitmap->installPixels(info, const_cast<unsigned char*>(frame_data), 12);
 
     scoped_ptr<cc::CopyOutputResult> output =
@@ -56,14 +56,14 @@ class AuraDesktopCapturerTest : public testing::Test,
     capturer_->OnFrameCaptured(output.Pass());
   }
 
-  scoped_ptr<AuraDesktopCapturer> capturer_;
+  scoped_ptr<AuraScreenCapturer> capturer_;
 };
 
-void AuraDesktopCapturerTest::SetUp() {
-  capturer_.reset(new AuraDesktopCapturer());
+void AuraScreenCapturerTest::SetUp() {
+  capturer_.reset(new AuraScreenCapturer());
 }
 
-TEST_F(AuraDesktopCapturerTest, ConvertSkBitmapToDesktopFrame) {
+TEST_F(AuraScreenCapturerTest, ConvertSkBitmapToDesktopFrame) {
   webrtc::DesktopFrame* captured_frame = NULL;
 
   EXPECT_CALL(*this, OnCaptureCompleted(_)).Times(1).WillOnce(