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

Unified Diff: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated_unittest.mm

Issue 2560333002: Remove Deprecate Code For Desktop Capture Picker Old UI (Closed)
Patch Set: Further remove CombinedDesktopMediaList Created 4 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: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated_unittest.mm
diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated_unittest.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated_unittest.mm
deleted file mode 100644
index 0008b52781f1a6dce8b73dbc20dd90c10dcc8603..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated_unittest.mm
+++ /dev/null
@@ -1,259 +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.
-
-#import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.h"
-
-#include "base/bind.h"
-#include "base/run_loop.h"
-#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
-#include "chrome/browser/media/webrtc/fake_desktop_media_list.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#include "content/public/test/test_browser_thread_bundle.h"
-#include "testing/gtest_mac.h"
-
-@interface DesktopMediaPickerControllerDeprecated (ExposedForTesting)
-- (IKImageBrowserView*)sourceBrowser;
-- (NSButton*)shareButton;
-- (NSButton*)audioShareCheckbox;
-- (NSArray*)items;
-@end
-
-@implementation DesktopMediaPickerControllerDeprecated (ExposedForTesting)
-- (IKImageBrowserView*)sourceBrowser {
- return sourceBrowser_;
-}
-
-- (NSButton*)shareButton {
- return shareButton_;
-}
-
-- (NSButton*)cancelButton {
- return cancelButton_;
-}
-
-- (NSButton*)audioShareCheckbox {
- return audioShareCheckbox_;
-}
-
-- (NSArray*)items {
- return items_;
-}
-@end
-
-class DesktopMediaPickerControllerDeprecatedTest : public CocoaTest {
- public:
- DesktopMediaPickerControllerDeprecatedTest() {}
-
- void SetUp() override {
- CocoaTest::SetUp();
-
- screen_list_ = new FakeDesktopMediaList();
- window_list_ = new FakeDesktopMediaList();
- tab_list_ = new FakeDesktopMediaList();
-
- DesktopMediaPicker::DoneCallback callback =
- base::Bind(&DesktopMediaPickerControllerDeprecatedTest::OnResult,
- base::Unretained(this));
-
- controller_.reset([[DesktopMediaPickerControllerDeprecated alloc]
- initWithScreenList:std::unique_ptr<DesktopMediaList>(screen_list_)
- windowList:std::unique_ptr<DesktopMediaList>(window_list_)
- tabList:std::unique_ptr<DesktopMediaList>(tab_list_)
- parent:nil
- callback:callback
- appName:base::ASCIIToUTF16("Screenshare Test")
- targetName:base::ASCIIToUTF16("https://foo.com")
- requestAudio:true]);
- }
-
- void TearDown() override {
- controller_.reset();
- CocoaTest::TearDown();
- }
-
- bool WaitForCallback() {
- if (!callback_called_) {
- base::RunLoop().RunUntilIdle();
- }
- return callback_called_;
- }
-
- protected:
- void OnResult(content::DesktopMediaID source) {
- EXPECT_FALSE(callback_called_);
- callback_called_ = true;
- source_reported_ = source;
- }
-
- content::TestBrowserThreadBundle thread_bundle_;
- bool callback_called_ = false;
- content::DesktopMediaID source_reported_;
- FakeDesktopMediaList* screen_list_ = nullptr;
- FakeDesktopMediaList* window_list_ = nullptr;
- FakeDesktopMediaList* tab_list_ = nullptr;
- base::scoped_nsobject<DesktopMediaPickerControllerDeprecated> controller_;
-};
-
-TEST_F(DesktopMediaPickerControllerDeprecatedTest, ShowAndDismiss) {
- [controller_ showWindow:nil];
-
- window_list_->AddSource(0);
- window_list_->AddSource(1);
- window_list_->SetSourceThumbnail(1);
-
- NSArray* items = [controller_ items];
- EXPECT_EQ(2U, [items count]);
- EXPECT_NSEQ(@"0", [[items objectAtIndex:0] imageTitle]);
- EXPECT_EQ(nil, [[items objectAtIndex:0] imageRepresentation]);
- EXPECT_NSEQ(@"1", [[items objectAtIndex:1] imageTitle]);
- EXPECT_TRUE([[items objectAtIndex:1] imageRepresentation] != nil);
-}
-
-TEST_F(DesktopMediaPickerControllerDeprecatedTest, ClickShare) {
- [controller_ showWindow:nil];
-
- window_list_->AddSource(0);
- window_list_->SetSourceThumbnail(0);
- window_list_->AddSource(1);
- window_list_->SetSourceThumbnail(1);
-
- EXPECT_EQ(2U, [[controller_ items] count]);
- EXPECT_FALSE([[controller_ shareButton] isEnabled]);
-
- NSIndexSet* indexSet = [NSIndexSet indexSetWithIndex:1];
- [[controller_ sourceBrowser] setSelectionIndexes:indexSet
- byExtendingSelection:NO];
- EXPECT_TRUE([[controller_ shareButton] isEnabled]);
-
- [[controller_ shareButton] performClick:nil];
- EXPECT_TRUE(WaitForCallback());
- EXPECT_EQ(window_list_->GetSource(1).id, source_reported_);
-}
-
-TEST_F(DesktopMediaPickerControllerDeprecatedTest, ClickCancel) {
- [controller_ showWindow:nil];
-
- window_list_->AddSource(0);
- window_list_->SetSourceThumbnail(0);
- window_list_->AddSource(1);
- window_list_->SetSourceThumbnail(1);
-
- [[controller_ cancelButton] performClick:nil];
- EXPECT_TRUE(WaitForCallback());
- EXPECT_EQ(content::DesktopMediaID(), source_reported_);
-}
-
-TEST_F(DesktopMediaPickerControllerDeprecatedTest, CloseWindow) {
- [controller_ showWindow:nil];
-
- window_list_->AddSource(0);
- window_list_->SetSourceThumbnail(0);
- window_list_->AddSource(1);
- window_list_->SetSourceThumbnail(1);
-
- [controller_ close];
- EXPECT_TRUE(WaitForCallback());
- EXPECT_EQ(content::DesktopMediaID(), source_reported_);
-}
-
-TEST_F(DesktopMediaPickerControllerDeprecatedTest, UpdateThumbnail) {
- [controller_ showWindow:nil];
-
- window_list_->AddSource(0);
- window_list_->SetSourceThumbnail(0);
- window_list_->AddSource(1);
- window_list_->SetSourceThumbnail(1);
-
- NSArray* items = [controller_ items];
- EXPECT_EQ(2U, [items count]);
- NSUInteger version = [[items objectAtIndex:0] imageVersion];
-
- window_list_->SetSourceThumbnail(0);
- EXPECT_NE(version, [[items objectAtIndex:0] imageVersion]);
-}
-
-TEST_F(DesktopMediaPickerControllerDeprecatedTest, UpdateName) {
- [controller_ showWindow:nil];
-
- window_list_->AddSource(0);
- window_list_->SetSourceThumbnail(0);
- window_list_->AddSource(1);
- window_list_->SetSourceThumbnail(1);
-
- NSArray* items = [controller_ items];
- EXPECT_EQ(2U, [items count]);
- NSUInteger version = [[items objectAtIndex:0] imageVersion];
-
- window_list_->SetSourceThumbnail(0);
- EXPECT_NE(version, [[items objectAtIndex:0] imageVersion]);
-}
-
-TEST_F(DesktopMediaPickerControllerDeprecatedTest, RemoveSource) {
- [controller_ showWindow:nil];
-
- window_list_->AddSource(0);
- window_list_->AddSource(1);
- window_list_->AddSource(2);
- window_list_->SetSourceName(1, base::ASCIIToUTF16("foo"));
-
- NSArray* items = [controller_ items];
- EXPECT_EQ(3U, [items count]);
- EXPECT_NSEQ(@"foo", [[items objectAtIndex:1] imageTitle]);
-}
-
-TEST_F(DesktopMediaPickerControllerDeprecatedTest, MoveSource) {
- [controller_ showWindow:nil];
-
- window_list_->AddSource(0);
- window_list_->AddSource(1);
- window_list_->SetSourceName(1, base::ASCIIToUTF16("foo"));
- NSArray* items = [controller_ items];
- EXPECT_NSEQ(@"foo", [[items objectAtIndex:1] imageTitle]);
-
- window_list_->MoveSource(1, 0);
- EXPECT_NSEQ(@"foo", [[items objectAtIndex:0] imageTitle]);
-
- window_list_->MoveSource(0, 1);
- EXPECT_NSEQ(@"foo", [[items objectAtIndex:1] imageTitle]);
-}
-
-// Make sure the audio share checkbox' state reacts correctly with
-// the source selection. Namely the checkbox is enabled only for tab
-// sharing on Mac.
-TEST_F(DesktopMediaPickerControllerDeprecatedTest, AudioShareCheckboxState) {
- [controller_ showWindow:nil];
-
- screen_list_->AddSourceByFullMediaID(
- content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN, 0));
- window_list_->AddSourceByFullMediaID(
- content::DesktopMediaID(content::DesktopMediaID::TYPE_WINDOW, 1));
- tab_list_->AddSourceByFullMediaID(
- content::DesktopMediaID(content::DesktopMediaID::TYPE_WEB_CONTENTS, 2));
-
- NSButton* checkbox = [controller_ audioShareCheckbox];
- EXPECT_EQ(NO, [checkbox isEnabled]);
-
- NSIndexSet* index_set = [NSIndexSet indexSetWithIndex:0];
- [checkbox setEnabled:YES];
- [[controller_ sourceBrowser] setSelectionIndexes:index_set
- byExtendingSelection:NO];
- EXPECT_EQ(NO, [checkbox isEnabled]);
-
- index_set = [NSIndexSet indexSetWithIndex:1];
- [checkbox setEnabled:YES];
- [[controller_ sourceBrowser] setSelectionIndexes:index_set
- byExtendingSelection:NO];
- EXPECT_EQ(NO, [checkbox isEnabled]);
-
- index_set = [NSIndexSet indexSetWithIndex:2];
- [[controller_ sourceBrowser] setSelectionIndexes:index_set
- byExtendingSelection:NO];
- EXPECT_EQ(YES, [checkbox isEnabled]);
-
- index_set = [NSIndexSet indexSet];
- [[controller_ sourceBrowser] setSelectionIndexes:index_set
- byExtendingSelection:NO];
- EXPECT_EQ(NO, [checkbox isEnabled]);
-}

Powered by Google App Engine
This is Rietveld 408576698