chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm - Issue 2072003002: Desktop Capture Picker Window New UI For Mac

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

Issue 2072003002: Desktop Capture Picker Window New UI For Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm ('K') | « chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.mm ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm

index 663d5d9cf1b3efea550be3bc8e51a5b11a121fcc..a137438afd7921f0d3a1e64727c86c51ff633f98 100644

--- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm

@@ -2,7 +2,7 @@

// 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.h"

+#import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.h"

tapted 2016/06/20 12:18:36 You need to test the new interface as well - this

qiangchen 2016/06/21 23:31:28 Yep, I delay that after your initial code review,

#include "base/bind.h"

#include "base/run_loop.h"

@@ -13,14 +13,14 @@

#include "content/public/test/test_browser_thread_bundle.h"

#include "testing/gtest_mac.h"

-@interface DesktopMediaPickerController (ExposedForTesting)

+@interface DesktopMediaPickerControllerDeprecated (ExposedForTesting)

- (IKImageBrowserView*)sourceBrowser;

- (NSButton*)shareButton;

- (NSButton*)audioShareCheckbox;

- (NSArray*)items;

@end

-@implementation DesktopMediaPickerController (ExposedForTesting)

+@implementation DesktopMediaPickerControllerDeprecated (ExposedForTesting)

- (IKImageBrowserView*)sourceBrowser {

return sourceBrowser_;

}

@@ -57,7 +57,7 @@ class DesktopMediaPickerControllerTest : public CocoaTest {

base::Bind(&DesktopMediaPickerControllerTest::OnResult,

base::Unretained(this));

- controller_.reset([[DesktopMediaPickerController alloc]

+ 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_)

@@ -93,7 +93,7 @@ class DesktopMediaPickerControllerTest : public CocoaTest {

FakeDesktopMediaList* screen_list_ = nullptr;

FakeDesktopMediaList* window_list_ = nullptr;

FakeDesktopMediaList* tab_list_ = nullptr;

- base::scoped_nsobject<DesktopMediaPickerController> controller_;

+ base::scoped_nsobject<DesktopMediaPickerControllerDeprecated> controller_;

};

TEST_F(DesktopMediaPickerControllerTest, ShowAndDismiss) {