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

Unified Diff: chrome/browser/media/desktop_media_list_ash_unittest.cc

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)
Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 months 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
« no previous file with comments | « chrome/browser/media/desktop_media_list_ash.cc ('k') | chrome/browser/media/desktop_media_list_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/desktop_media_list_ash_unittest.cc
diff --git a/chrome/browser/media/desktop_media_list_ash_unittest.cc b/chrome/browser/media/desktop_media_list_ash_unittest.cc
deleted file mode 100644
index 07c9bb927bc85e7b64c65f700ed03277d4676c7c..0000000000000000000000000000000000000000
--- a/chrome/browser/media/desktop_media_list_ash_unittest.cc
+++ /dev/null
@@ -1,128 +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 "chrome/browser/media/desktop_media_list_ash.h"
-
-#include "ash/test/ash_test_base.h"
-#include "base/location.h"
-#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
-#include "base/single_thread_task_runner.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "build/build_config.h"
-#include "chrome/browser/media/desktop_media_list_observer.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura/window.h"
-
-int kThumbnailSize = 100;
-
-using testing::AtLeast;
-using testing::DoDefault;
-
-class MockDesktopMediaListObserver : public DesktopMediaListObserver {
- public:
- MOCK_METHOD2(OnSourceAdded, void(DesktopMediaList* list, int index));
- MOCK_METHOD2(OnSourceRemoved, void(DesktopMediaList* list, int index));
- MOCK_METHOD3(OnSourceMoved,
- void(DesktopMediaList* list, int old_index, int new_index));
- MOCK_METHOD2(OnSourceNameChanged, void(DesktopMediaList* list, int index));
- MOCK_METHOD2(OnSourceThumbnailChanged,
- void(DesktopMediaList* list, int index));
-};
-
-class DesktopMediaListAshTest : public ash::test::AshTestBase {
- public:
- DesktopMediaListAshTest() {}
- ~DesktopMediaListAshTest() override {}
-
- void CreateList(int source_types) {
- list_.reset(new DesktopMediaListAsh(source_types));
- list_->SetThumbnailSize(gfx::Size(kThumbnailSize, kThumbnailSize));
-
- // Set update period to reduce the time it takes to run tests.
- list_->SetUpdatePeriod(base::TimeDelta::FromMilliseconds(1));
- }
-
- protected:
- MockDesktopMediaListObserver observer_;
- std::unique_ptr<DesktopMediaListAsh> list_;
- DISALLOW_COPY_AND_ASSIGN(DesktopMediaListAshTest);
-};
-
-ACTION(QuitMessageLoop) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
-}
-
-TEST_F(DesktopMediaListAshTest, Screen) {
- CreateList(DesktopMediaListAsh::SCREENS | DesktopMediaListAsh::WINDOWS);
-
- EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 0));
- EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 0))
- .WillOnce(QuitMessageLoop())
- .WillRepeatedly(DoDefault());
- list_->StartUpdating(&observer_);
- base::MessageLoop::current()->Run();
-}
-
-TEST_F(DesktopMediaListAshTest, OneWindow) {
- CreateList(DesktopMediaListAsh::SCREENS | DesktopMediaListAsh::WINDOWS);
-
- std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
-
- EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 0));
- EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 1));
- EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 0))
- .Times(AtLeast(1));
- EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 1))
- .WillOnce(QuitMessageLoop())
- .WillRepeatedly(DoDefault());
- EXPECT_CALL(observer_, OnSourceRemoved(list_.get(), 1))
- .WillOnce(QuitMessageLoop());
-
- list_->StartUpdating(&observer_);
- base::MessageLoop::current()->Run();
- window.reset();
- base::MessageLoop::current()->Run();
-}
-
-TEST_F(DesktopMediaListAshTest, ScreenOnly) {
- CreateList(DesktopMediaListAsh::SCREENS);
-
- std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
-
- EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 0));
- EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 0))
- .WillOnce(QuitMessageLoop())
- .WillRepeatedly(DoDefault());
-
- list_->StartUpdating(&observer_);
- base::MessageLoop::current()->Run();
-}
-
-// Times out on Win DrMemory bot. http://crbug.com/493187
-#if defined(OS_WIN)
-#define MAYBE_WindowOnly DISABLED_WindowOnly
-#else
-#define MAYBE_WindowOnly WindowOnly
-#endif
-
-TEST_F(DesktopMediaListAshTest, MAYBE_WindowOnly) {
- CreateList(DesktopMediaListAsh::WINDOWS);
-
- std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
-
- EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 0));
- EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 0))
- .WillOnce(QuitMessageLoop())
- .WillRepeatedly(DoDefault());
- EXPECT_CALL(observer_, OnSourceRemoved(list_.get(), 0))
- .WillOnce(QuitMessageLoop());
-
- list_->StartUpdating(&observer_);
- base::MessageLoop::current()->Run();
- window.reset();
- base::MessageLoop::current()->Run();
-}
« no previous file with comments | « chrome/browser/media/desktop_media_list_ash.cc ('k') | chrome/browser/media/desktop_media_list_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698