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

Unified Diff: chrome/browser/ui/views/chooser_content_view_unittest.cc

Issue 2155743002: Add throbber and status text to WebBluetooth chooser UI on non-Mac desktops (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 5 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
Index: chrome/browser/ui/views/chooser_content_view_unittest.cc
diff --git a/chrome/browser/ui/views/chooser_content_view_unittest.cc b/chrome/browser/ui/views/chooser_content_view_unittest.cc
index 1002e7eb3033b6588644c2792da0b8c2e39ee86f..4b8a726a168ddd9bd40559d79f2da2d1ae7e1c29 100644
--- a/chrome/browser/ui/views/chooser_content_view_unittest.cc
+++ b/chrome/browser/ui/views/chooser_content_view_unittest.cc
@@ -14,7 +14,6 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/views/controls/styled_label.h"
-#include "ui/views/controls/styled_label_listener.h"
#include "ui/views/controls/table/table_view.h"
#include "ui/views/controls/table/table_view_observer.h"
@@ -26,15 +25,6 @@ class MockTableViewObserver : public views::TableViewObserver {
MOCK_METHOD0(OnSelectionChanged, void());
};
-class MockStyledLabelListener : public views::StyledLabelListener {
- public:
- // views::StyledLabelListener:
- MOCK_METHOD3(StyledLabelLinkClicked,
- void(views::StyledLabel* label,
- const gfx::Range& range,
- int event_flags));
-};
-
} // namespace
class ChooserContentViewTest : public testing::Test {
@@ -53,9 +43,7 @@ class ChooserContentViewTest : public testing::Test {
ASSERT_TRUE(table_view_);
table_model_ = table_view_->model();
ASSERT_TRUE(table_model_);
- mock_styled_label_listener_.reset(new MockStyledLabelListener());
- styled_label_.reset(chooser_content_view_->CreateFootnoteView(
- mock_styled_label_listener_.get()));
+ styled_label_.reset(chooser_content_view_->CreateFootnoteView());
ASSERT_TRUE(styled_label_);
}
@@ -65,7 +53,6 @@ class ChooserContentViewTest : public testing::Test {
MockChooserController* mock_chooser_controller_;
views::TableView* table_view_;
ui::TableModel* table_model_;
- std::unique_ptr<MockStyledLabelListener> mock_styled_label_listener_;
std::unique_ptr<views::StyledLabel> styled_label_;
private:
@@ -305,10 +292,3 @@ TEST_F(ChooserContentViewTest,
EXPECT_EQ(0, table_view_->SelectedRowCount());
EXPECT_EQ(-1, table_view_->FirstSelectedRow());
}
-
-TEST_F(ChooserContentViewTest, ClickStyledLabelLink) {
msw 2016/07/18 23:01:31 nit: can you test the same with the ChooserContent
juncai 2016/07/19 20:42:46 Done.
- EXPECT_CALL(*mock_styled_label_listener_,
- StyledLabelLinkClicked(styled_label_.get(), testing::_, 0))
- .Times(1);
- styled_label_->LinkClicked(nullptr, 0);
-}

Powered by Google App Engine
This is Rietveld 408576698