Desktop Capture Picker Window New UI For Mac

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

 // 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.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 effectively just deletes all
the tests.

[qiangchen, 2016/06/21 23:31:28]

Yep, I delay that after your initial code review, in case you have some
structural suggestion.

 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/desktop_media_list_observer.h"
 #include "chrome/browser/media/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 DesktopMediaPickerController (ExposedForTesting)
+@interface DesktopMediaPickerControllerDeprecated (ExposedForTesting)
 - (IKImageBrowserView*)sourceBrowser;
 - (NSButton*)shareButton;
 - (NSButton*)audioShareCheckbox;
 - (NSArray*)items;
 @end
 
-@implementation DesktopMediaPickerController (ExposedForTesting)
+@implementation DesktopMediaPickerControllerDeprecated (ExposedForTesting)
 - (IKImageBrowserView*)sourceBrowser {
   return sourceBrowser_;
 }
 
 - (NSButton*)shareButton {
   return shareButton_;
 }
 
 - (NSButton*)cancelButton {
   return cancelButton_;
@@ skipping 16 matching lines @@
     CocoaTest::SetUp();
 
     screen_list_ = new FakeDesktopMediaList();
     window_list_ = new FakeDesktopMediaList();
     tab_list_ = new FakeDesktopMediaList();
 
     DesktopMediaPicker::DoneCallback callback =
         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_)
                     parent:nil
                   callback:callback
                    appName:base::ASCIIToUTF16("Screenshare Test")
                 targetName:base::ASCIIToUTF16("https://foo.com")
               requestAudio:true]);
   }
 
@@ skipping 15 matching lines @@
     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<DesktopMediaPickerController> controller_;
+  base::scoped_nsobject<DesktopMediaPickerControllerDeprecated> controller_;
 };
 
 TEST_F(DesktopMediaPickerControllerTest, ShowAndDismiss) {
   [controller_ showWindow:nil];
 
   window_list_->AddSource(0);
   window_list_->AddSource(1);
   window_list_->SetSourceThumbnail(1);
 
   NSArray* items = [controller_ items];
@@ skipping 143 matching lines @@
   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]);
 }