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

Unified Diff: content/browser/renderer_host/media/desktop_capture_device_aura_unittest.cc

Issue 104653007: Renamed DesktopCaptureDeviceAsh to DesktopCaptureDeviceAura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
Index: content/browser/renderer_host/media/desktop_capture_device_aura_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_aura_unittest.cc
similarity index 92%
rename from content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc
rename to content/browser/renderer_host/media/desktop_capture_device_aura_unittest.cc
index 2e82475219dc80eb461d85f82a1b8fe8fbe59535..1e87c69300532987a940c61bcaf6415d3b751287 100644
--- a/content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc
+++ b/content/browser/renderer_host/media/desktop_capture_device_aura_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 "content/browser/renderer_host/media/desktop_capture_device_ash.h"
+#include "content/browser/renderer_host/media/desktop_capture_device_aura.h"
#include "base/synchronization/waitable_event.h"
#include "content/browser/browser_thread_impl.h"
@@ -49,18 +49,18 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {
};
// Test harness that sets up a minimal environment with necessary stubs.
-class DesktopCaptureDeviceAshTest : public testing::Test {
+class DesktopCaptureDeviceAuraTest : public testing::Test {
public:
- DesktopCaptureDeviceAshTest()
+ DesktopCaptureDeviceAuraTest()
: browser_thread_for_ui_(BrowserThread::UI, &message_loop_) {}
- virtual ~DesktopCaptureDeviceAshTest() {}
+ virtual ~DesktopCaptureDeviceAuraTest() {}
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
+ // We need a window to cover desktop area so that DesktopCaptureDeviceAura
// can use gfx::NativeWindow::GetWindowAtScreenPoint() to locate the
// root window associated with the primary display.
gfx::Rect desktop_bounds = root_window()->bounds();
@@ -90,13 +90,13 @@ class DesktopCaptureDeviceAshTest : public testing::Test {
scoped_ptr<aura::Window> desktop_window_;
scoped_ptr<aura::test::TestWindowDelegate> window_delegate_;
- DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAshTest);
+ DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAuraTest);
};
-TEST_F(DesktopCaptureDeviceAshTest, StartAndStop) {
+TEST_F(DesktopCaptureDeviceAuraTest, StartAndStop) {
DesktopMediaID source(DesktopMediaID::TYPE_SCREEN, 0);
scoped_ptr<media::VideoCaptureDevice> capture_device(
- DesktopCaptureDeviceAsh::Create(source));
+ DesktopCaptureDeviceAura::Create(source));
scoped_ptr<MockDeviceClient> client(new MockDeviceClient());
EXPECT_CALL(*client, OnError()).Times(0);

Powered by Google App Engine
This is Rietveld 408576698