Extend content::DesktopMediaID to allow Aura windows as capture sources.

content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc

Index: content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc
diff --git a/content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc b/content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc
deleted file mode 100644
index 2e82475219dc80eb461d85f82a1b8fe8fbe59535..0000000000000000000000000000000000000000
--- a/content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2013 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 "content/browser/renderer_host/media/desktop_capture_device_ash.h"
-
-#include "base/synchronization/waitable_event.h"
-#include "content/browser/browser_thread_impl.h"
-#include "media/video/capture/video_capture_types.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura/client/window_tree_client.h"
-#include "ui/aura/test/aura_test_helper.h"
-#include "ui/aura/test/test_window_delegate.h"
-#include "ui/aura/window.h"
-
-using ::testing::_;
-using ::testing::AnyNumber;
-using ::testing::DoAll;
-using ::testing::Expectation;
-using ::testing::InvokeWithoutArgs;
-using ::testing::SaveArg;
-
-namespace content {
-namespace {
-
-const int kFrameRate = 30;
-
-class MockDeviceClient : public media::VideoCaptureDevice::Client {
- public:
-  MOCK_METHOD2(ReserveOutputBuffer,
-               scoped_refptr<Buffer>(media::VideoFrame::Format format,
-                                     const gfx::Size& dimensions));
-  MOCK_METHOD0(OnError, void());
-  MOCK_METHOD7(OnIncomingCapturedFrame,
-               void(const uint8* data,
-                    int length,
-                    base::Time timestamp,
-                    int rotation,
-                    bool flip_vert,
-                    bool flip_horiz,
-                    const media::VideoCaptureFormat& frame_format));
-  MOCK_METHOD5(OnIncomingCapturedBuffer,
-               void(const scoped_refptr<Buffer>& buffer,
-                    media::VideoFrame::Format format,
-                    const gfx::Size& dimensions,
-                    base::Time timestamp,
-                    int frame_rate));
-};
-
-// Test harness that sets up a minimal environment with necessary stubs.
-class DesktopCaptureDeviceAshTest : public testing::Test {
- public:
-  DesktopCaptureDeviceAshTest()
-      : browser_thread_for_ui_(BrowserThread::UI, &message_loop_) {}
-  virtual ~DesktopCaptureDeviceAshTest() {}
-
- protected:
-  virtual void SetUp() OVERRIDE {
-    helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
-    helper_->SetUp();
-
-    // We need a window to cover desktop area so that DesktopCaptureDeviceAsh
-    // can use gfx::NativeWindow::GetWindowAtScreenPoint() to locate the
-    // root window associated with the primary display.
-    gfx::Rect desktop_bounds = root_window()->bounds();
-    window_delegate_.reset(new aura::test::TestWindowDelegate());
-    desktop_window_.reset(new aura::Window(window_delegate_.get()));
-    desktop_window_->Init(ui::LAYER_TEXTURED);
-    desktop_window_->SetBounds(desktop_bounds);
-    aura::client::ParentWindowWithContext(
-        desktop_window_.get(), root_window(), desktop_bounds);
-    desktop_window_->Show();
-  }
-
-  virtual void TearDown() OVERRIDE {
-    helper_->RunAllPendingInMessageLoop();
-    root_window()->RemoveChild(desktop_window_.get());
-    desktop_window_.reset();
-    window_delegate_.reset();
-    helper_->TearDown();
-  }
-
-  aura::Window* root_window() { return helper_->root_window(); }
-
- private:
-  base::MessageLoopForUI message_loop_;
-  BrowserThreadImpl browser_thread_for_ui_;
-  scoped_ptr<aura::test::AuraTestHelper> helper_;
-  scoped_ptr<aura::Window> desktop_window_;
-  scoped_ptr<aura::test::TestWindowDelegate> window_delegate_;
-
-  DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAshTest);
-};
-
-TEST_F(DesktopCaptureDeviceAshTest, StartAndStop) {
-  DesktopMediaID source(DesktopMediaID::TYPE_SCREEN, 0);
-  scoped_ptr<media::VideoCaptureDevice> capture_device(
-      DesktopCaptureDeviceAsh::Create(source));
-
-  scoped_ptr<MockDeviceClient> client(new MockDeviceClient());
-  EXPECT_CALL(*client, OnError()).Times(0);
-
-  media::VideoCaptureParams capture_params;
-  capture_params.requested_format.frame_size.SetSize(640, 480);
-  capture_params.requested_format.frame_rate = kFrameRate;
-  capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
-  capture_params.allow_resolution_change = false;
-  capture_device->AllocateAndStart(
-      capture_params, client.PassAs<media::VideoCaptureDevice::Client>());
-  capture_device->StopAndDeAllocate();
-}
-
-}  // namespace
-}  // namespace content