Desktop Capture Picker New UI: Non Mac Structure Change

chrome/browser/ui/views/desktop_media_picker_views_unittest.cc

Index: chrome/browser/ui/views/desktop_media_picker_views_unittest.cc
diff --git a/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc b/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc
index ea3e4bfb36835b7f88ccf1a2fdbe0ec2c6e9c2d1..520423b08fbc487953dca0af1b52d23c3cb49202 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/desktop_media_picker_views.h"
 
+#include <map>
 #include <utility>
 
 #include "base/bind.h"
@@ -16,12 +17,19 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/window.h"
 #include "ui/events/event_utils.h"
+#include "ui/views/controls/button/checkbox.h"
+#include "ui/views/controls/button/label_button.h"
 #include "ui/views/test/scoped_views_test_helper.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
+using content::DesktopMediaID;
+
 namespace views {
+const std::vector<DesktopMediaID::Type> kSourceTypes = {
+    DesktopMediaID::TYPE_SCREEN, DesktopMediaID::TYPE_WINDOW,
+    DesktopMediaID::TYPE_WEB_CONTENTS};
 
 class DesktopMediaPickerViewsTest : public testing::Test {
  public:
@@ -29,19 +37,23 @@ class DesktopMediaPickerViewsTest : public testing::Test {
   ~DesktopMediaPickerViewsTest() override {}
 
   void SetUp() override {
-    screen_list_ = new FakeDesktopMediaList();
-    window_list_ = new FakeDesktopMediaList();
-    tab_list_ = new FakeDesktopMediaList();
-    std::unique_ptr<FakeDesktopMediaList> screen_list(screen_list_);
-    std::unique_ptr<FakeDesktopMediaList> window_list(window_list_);
-    std::unique_ptr<FakeDesktopMediaList> tab_list(tab_list_);
+    media_lists_[DesktopMediaID::TYPE_SCREEN] = new FakeDesktopMediaList();
+    media_lists_[DesktopMediaID::TYPE_WINDOW] = new FakeDesktopMediaList();
+    media_lists_[DesktopMediaID::TYPE_WEB_CONTENTS] =
+        new FakeDesktopMediaList();
+    std::unique_ptr<FakeDesktopMediaList> screen_list(
+        media_lists_[DesktopMediaID::TYPE_SCREEN]);
+    std::unique_ptr<FakeDesktopMediaList> window_list(
+        media_lists_[DesktopMediaID::TYPE_WINDOW]);
+    std::unique_ptr<FakeDesktopMediaList> tab_list(
+        media_lists_[DesktopMediaID::TYPE_WEB_CONTENTS]);
 
     base::string16 app_name = base::ASCIIToUTF16("foo");
 
     picker_views_.reset(new DesktopMediaPickerViews());
     picker_views_->Show(NULL, test_helper_.GetContext(), NULL, app_name,
                         app_name, std::move(screen_list),
-                        std::move(window_list), std::move(tab_list), false,
+                        std::move(window_list), std::move(tab_list), true,
                         base::Bind(&DesktopMediaPickerViewsTest::OnPickerDone,
                                    base::Unretained(this)));
   }
@@ -57,14 +69,25 @@ class DesktopMediaPickerViewsTest : public testing::Test {
     return picker_views_->GetDialogViewForTesting();
   }
 
+  bool ClickSourceTypeButton(DesktopMediaID::Type source_type) {
+    LabelButton* button =
+        GetPickerDialogView()->GetSourceTypeButtonForTesting(source_type);
+    if (!button)
+      return false;
+    gfx::Rect bound = button->GetLocalBounds();
+    button->OnMouseReleased(ui::MouseEvent(
+        ui::EventType::ET_MOUSE_RELEASED, gfx::Point(bound.x(), bound.y()),
+        gfx::Point(bound.x(), bound.y()), base::TimeDelta(),
+        ui::EventFlags::EF_LEFT_MOUSE_BUTTON, 0));
+    return true;
+  }
+
   MOCK_METHOD1(OnPickerDone, void(content::DesktopMediaID));
 
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
   views::ScopedViewsTestHelper test_helper_;
-  FakeDesktopMediaList* screen_list_;
-  FakeDesktopMediaList* window_list_;
-  FakeDesktopMediaList* tab_list_;
+  std::map<DesktopMediaID::Type, FakeDesktopMediaList*> media_lists_;
   std::unique_ptr<DesktopMediaPickerViews> picker_views_;
 };
 
@@ -76,16 +99,19 @@ TEST_F(DesktopMediaPickerViewsTest, DoneCallbackCalledWhenWindowClosed) {
 }
 
 TEST_F(DesktopMediaPickerViewsTest, DoneCallbackCalledOnOkButtonPressed) {
-  const int kFakeId = 222;
-  EXPECT_CALL(*this,
-              OnPickerDone(content::DesktopMediaID(
-                  content::DesktopMediaID::TYPE_WINDOW, kFakeId)));
-  window_list_->AddSource(kFakeId);
+  const DesktopMediaID kFakeId(DesktopMediaID::TYPE_WINDOW, 222);
+  EXPECT_CALL(*this, OnPickerDone(kFakeId));
+
+  media_lists_[DesktopMediaID::TYPE_WINDOW]->AddSourceByFullMediaID(kFakeId);
+  GetPickerDialogView()->GetCheckboxForTesting()->SetChecked(true);
 
   EXPECT_FALSE(
       GetPickerDialogView()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
 
+  EXPECT_TRUE(ClickSourceTypeButton(DesktopMediaID::TYPE_WINDOW));
+
   GetPickerDialogView()->GetMediaSourceViewForTesting(0)->OnFocus();
+
   EXPECT_TRUE(
       GetPickerDialogView()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
 
@@ -96,42 +122,49 @@ TEST_F(DesktopMediaPickerViewsTest, DoneCallbackCalledOnOkButtonPressed) {
 // Verifies that a MediaSourceView is selected with mouse left click and
 // original selected MediaSourceView gets unselected.
 TEST_F(DesktopMediaPickerViewsTest, SelectMediaSourceViewOnSingleClick) {
-  window_list_->AddSource(0);
-  window_list_->AddSource(1);
+  for (auto source_type : kSourceTypes) {
+    EXPECT_TRUE(ClickSourceTypeButton(source_type));
+    media_lists_[source_type]->AddSource(0);
+    media_lists_[source_type]->AddSource(1);
 
-  DesktopMediaSourceView* source_view_0 =
-      GetPickerDialogView()->GetMediaSourceViewForTesting(0);
+    DesktopMediaSourceView* source_view_0 =
+        GetPickerDialogView()->GetMediaSourceViewForTesting(0);
 
-  DesktopMediaSourceView* source_view_1 =
-      GetPickerDialogView()->GetMediaSourceViewForTesting(1);
+    DesktopMediaSourceView* source_view_1 =
+        GetPickerDialogView()->GetMediaSourceViewForTesting(1);
 
-  // Both media source views are not selected initially.
-  EXPECT_FALSE(source_view_0->is_selected());
-  EXPECT_FALSE(source_view_1->is_selected());
+    // Both media source views are not selected initially.
+    EXPECT_FALSE(source_view_0->is_selected());
+    EXPECT_FALSE(source_view_1->is_selected());
 
-  // Source view 0 is selected with mouse click.
-  ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
+    // Source view 0 is selected with mouse click.
+    ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
+                         ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
 
-  GetPickerDialogView()->GetMediaSourceViewForTesting(0)->OnMousePressed(press);
+    GetPickerDialogView()->GetMediaSourceViewForTesting(0)->OnMousePressed(
+        press);
 
-  EXPECT_TRUE(source_view_0->is_selected());
-  EXPECT_FALSE(source_view_1->is_selected());
+    EXPECT_TRUE(source_view_0->is_selected());
+    EXPECT_FALSE(source_view_1->is_selected());
 
-  // Source view 1 is selected and source view 0 is unselected with mouse click.
-  GetPickerDialogView()->GetMediaSourceViewForTesting(1)->OnMousePressed(press);
+    // Source view 1 is selected and source view 0 is unselected with mouse
+    // click.
+    GetPickerDialogView()->GetMediaSourceViewForTesting(1)->OnMousePressed(
+        press);
 
-  EXPECT_FALSE(source_view_0->is_selected());
-  EXPECT_TRUE(source_view_1->is_selected());
+    EXPECT_FALSE(source_view_0->is_selected());
+    EXPECT_TRUE(source_view_1->is_selected());
+  }
 }
 
 TEST_F(DesktopMediaPickerViewsTest, DoneCallbackCalledOnDoubleClick) {
-  const int kFakeId = 222;
-  EXPECT_CALL(*this,
-              OnPickerDone(content::DesktopMediaID(
-                  content::DesktopMediaID::TYPE_WINDOW, kFakeId)));
+  const DesktopMediaID kFakeId(DesktopMediaID::TYPE_WEB_CONTENTS, 222);
+  EXPECT_CALL(*this, OnPickerDone(kFakeId));
 
-  window_list_->AddSource(kFakeId);
+  media_lists_[DesktopMediaID::TYPE_WEB_CONTENTS]->AddSourceByFullMediaID(
+      kFakeId);
+  EXPECT_TRUE(ClickSourceTypeButton(DesktopMediaID::TYPE_WEB_CONTENTS));
+  GetPickerDialogView()->GetCheckboxForTesting()->SetChecked(false);
 
   ui::MouseEvent double_click(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                               ui::EventTimeForNow(),
@@ -144,12 +177,13 @@ TEST_F(DesktopMediaPickerViewsTest, DoneCallbackCalledOnDoubleClick) {
 }
 
 TEST_F(DesktopMediaPickerViewsTest, DoneCallbackCalledOnDoubleTap) {
-  const int kFakeId = 222;
-  EXPECT_CALL(*this,
-              OnPickerDone(content::DesktopMediaID(
-                  content::DesktopMediaID::TYPE_WINDOW, kFakeId)));
+  const DesktopMediaID kFakeId(DesktopMediaID::TYPE_SCREEN, 222);
+  EXPECT_CALL(*this, OnPickerDone(kFakeId));
+
+  EXPECT_TRUE(ClickSourceTypeButton(DesktopMediaID::TYPE_SCREEN));
+  GetPickerDialogView()->GetCheckboxForTesting()->SetChecked(false);
 
-  window_list_->AddSource(kFakeId);
+  media_lists_[DesktopMediaID::TYPE_SCREEN]->AddSourceByFullMediaID(kFakeId);
   ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
   details.set_tap_count(2);
   ui::GestureEvent double_tap(10, 10, 0, base::TimeDelta(), details);
@@ -167,65 +201,126 @@ TEST_F(DesktopMediaPickerViewsTest, CancelButtonAlwaysEnabled) {
 // Verifies that the MediaSourceView is added or removed when |media_list_| is
 // updated.
 TEST_F(DesktopMediaPickerViewsTest, AddAndRemoveMediaSource) {
-  // No media source at first.
-  EXPECT_EQ(NULL, GetPickerDialogView()->GetMediaSourceViewForTesting(0));
-
-  for (int i = 0; i < 3; ++i) {
-    window_list_->AddSource(i);
-    EXPECT_TRUE(GetPickerDialogView()->GetMediaSourceViewForTesting(i));
-  }
+  for (auto source_type : kSourceTypes) {
+    EXPECT_TRUE(ClickSourceTypeButton(source_type));
+    // No media source at first.
+    EXPECT_EQ(NULL, GetPickerDialogView()->GetMediaSourceViewForTesting(0));
+
+    for (int i = 0; i < 3; ++i) {
+      media_lists_[source_type]->AddSourceByFullMediaID(
+          DesktopMediaID(source_type, i));
+      EXPECT_TRUE(GetPickerDialogView()->GetMediaSourceViewForTesting(i));
+    }
 
-  for (int i = 2; i >= 0; --i) {
-    window_list_->RemoveSource(i);
-    EXPECT_EQ(NULL, GetPickerDialogView()->GetMediaSourceViewForTesting(i));
+    for (int i = 2; i >= 0; --i) {
+      media_lists_[source_type]->RemoveSource(i);
+      EXPECT_EQ(NULL, GetPickerDialogView()->GetMediaSourceViewForTesting(i));
+    }
   }
 }
 
 // Verifies that focusing the MediaSourceView marks it selected and the
 // original selected MediaSourceView gets unselected.
 TEST_F(DesktopMediaPickerViewsTest, FocusMediaSourceViewToSelect) {
-  window_list_->AddSource(0);
-  window_list_->AddSource(1);
+  for (auto source_type : kSourceTypes) {
+    ClickSourceTypeButton(source_type);
+    media_lists_[source_type]->AddSourceByFullMediaID(
+        DesktopMediaID(source_type, 0));
+    media_lists_[source_type]->AddSourceByFullMediaID(
+        DesktopMediaID(source_type, 1));
+
+    DesktopMediaSourceView* source_view_0 =
+        GetPickerDialogView()->GetMediaSourceViewForTesting(0);
+
+    DesktopMediaSourceView* source_view_1 =
+        GetPickerDialogView()->GetMediaSourceViewForTesting(1);
+
+    // Default choose the first screen for screen share.
+    if (source_type == DesktopMediaID::TYPE_SCREEN) {
+      EXPECT_TRUE(source_view_0->is_selected());
+    } else {
+      EXPECT_FALSE(source_view_0->is_selected());
+    }
+    EXPECT_FALSE(source_view_1->is_selected());
 
-  DesktopMediaSourceView* source_view_0 =
-      GetPickerDialogView()->GetMediaSourceViewForTesting(0);
+    source_view_0->OnFocus();
+    EXPECT_TRUE(source_view_0->is_selected());
 
-  DesktopMediaSourceView* source_view_1 =
-      GetPickerDialogView()->GetMediaSourceViewForTesting(1);
+    // Removing the focus does not undo the selection.
+    source_view_0->OnBlur();
+    EXPECT_TRUE(source_view_0->is_selected());
 
-  EXPECT_FALSE(source_view_0->is_selected());
-  EXPECT_FALSE(source_view_1->is_selected());
+    source_view_1->OnFocus();
+    EXPECT_FALSE(source_view_0->is_selected());
+    EXPECT_TRUE(source_view_1->is_selected());
+  }
+}
 
-  source_view_0->OnFocus();
-  EXPECT_TRUE(source_view_0->is_selected());
+TEST_F(DesktopMediaPickerViewsTest, OkButtonDisabledWhenNoSelection) {
+  for (auto source_type : kSourceTypes) {
+    EXPECT_TRUE(ClickSourceTypeButton(source_type));
+    media_lists_[source_type]->AddSourceByFullMediaID(
+        DesktopMediaID(source_type, 111));
+
+    GetPickerDialogView()->GetMediaSourceViewForTesting(0)->OnFocus();
+    EXPECT_TRUE(
+        GetPickerDialogView()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
+
+    media_lists_[source_type]->RemoveSource(0);
+    EXPECT_FALSE(
+        GetPickerDialogView()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
+  }
+}
 
-  // Removing the focus does not undo the selection.
-  source_view_0->OnBlur();
-  EXPECT_TRUE(source_view_0->is_selected());
+// Verifies that the MediaListView get the initial focus.
+TEST_F(DesktopMediaPickerViewsTest, ListViewHasInitialFocus) {
+  EXPECT_TRUE(GetPickerDialogView()->GetMediaListViewForTesting()->HasFocus());
+}
 
-  source_view_1->OnFocus();
-  EXPECT_FALSE(source_view_0->is_selected());
-  EXPECT_TRUE(source_view_1->is_selected());
+// Verifies the visible status of audio checkbox.
+TEST_F(DesktopMediaPickerViewsTest, AudioCheckboxState) {
+  bool expect_value;
+  EXPECT_TRUE(ClickSourceTypeButton(DesktopMediaID::TYPE_SCREEN));
+#if defined(OS_WIN) || defined(USE_CRAS)
+  expect_value = true;
+#else
+  expect_value = false;
+#endif
+  EXPECT_EQ(expect_value,
+            GetPickerDialogView()->GetCheckboxForTesting()->visible());
+
+  EXPECT_TRUE(ClickSourceTypeButton(DesktopMediaID::TYPE_WINDOW));
+  EXPECT_EQ(false, GetPickerDialogView()->GetCheckboxForTesting()->visible());
+
+  EXPECT_TRUE(ClickSourceTypeButton(DesktopMediaID::TYPE_WEB_CONTENTS));
+  EXPECT_EQ(true, GetPickerDialogView()->GetCheckboxForTesting()->visible());
 }
 
-TEST_F(DesktopMediaPickerViewsTest, OkButtonDisabledWhenNoSelection) {
-  window_list_->AddSource(111);
+// Verifies that audio share information is recorded in the ID if the checkbox
+// is checked.
+TEST_F(DesktopMediaPickerViewsTest, DoneWithAudioShare) {
+  DesktopMediaID originId(DesktopMediaID::TYPE_WEB_CONTENTS, 222);
+  DesktopMediaID returnId = originId;
+  returnId.audio_share = true;
 
-  EXPECT_FALSE(
-      GetPickerDialogView()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
+  // It is also the real workflow when a source is generated in media_list,
+  // its |audio_share| bit is not set. The bit is set by the picker UI if the
+  // audio checkbox is checked.
+  EXPECT_CALL(*this, OnPickerDone(returnId));
+  media_lists_[DesktopMediaID::TYPE_WEB_CONTENTS]->AddSourceByFullMediaID(
+      originId);
 
-  GetPickerDialogView()->GetMediaSourceViewForTesting(0)->OnFocus();
-  EXPECT_TRUE(
-      GetPickerDialogView()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
+  EXPECT_TRUE(ClickSourceTypeButton(DesktopMediaID::TYPE_WEB_CONTENTS));
+  GetPickerDialogView()->GetCheckboxForTesting()->SetChecked(true);
 
-  window_list_->RemoveSource(0);
-  EXPECT_FALSE(
-      GetPickerDialogView()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
-}
+  ui::MouseEvent double_click(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
+                              ui::EventTimeForNow(),
+                              ui::EF_LEFT_MOUSE_BUTTON | ui::EF_IS_DOUBLE_CLICK,
+                              ui::EF_LEFT_MOUSE_BUTTON);
 
-// Verifies that the MediaListView get the initial focus.
-TEST_F(DesktopMediaPickerViewsTest, ListViewHasInitialFocus) {
-  EXPECT_TRUE(GetPickerDialogView()->GetMediaListViewForTesting()->HasFocus());
+  GetPickerDialogView()->GetMediaSourceViewForTesting(0)->OnMousePressed(
+      double_click);
+  base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace views