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

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

Issue 2086663003: Change ChooserController ownership model (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address reillyg@'s comments 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
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 bbce6f17019689c9a9f682228874fff5e921854e..cb981209f3c6987da8f00a9f7c83865915e3832b 100644
--- a/chrome/browser/ui/views/chooser_content_view_unittest.cc
+++ b/chrome/browser/ui/views/chooser_content_view_unittest.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/ui/views/chooser_content_view.h"
+#include <memory>
+
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/grit/generated_resources.h"
@@ -41,10 +43,12 @@ class ChooserContentViewTest : public testing::Test {
// testing::Test:
void SetUp() override {
- mock_chooser_controller_.reset(new MockChooserController(nullptr));
+ std::unique_ptr<MockChooserController> mock_chooser_controller(
+ new MockChooserController(nullptr));
+ mock_chooser_controller_ = mock_chooser_controller.get();
mock_table_view_observer_.reset(new MockTableViewObserver());
chooser_content_view_.reset(new ChooserContentView(
- mock_table_view_observer_.get(), mock_chooser_controller_.get()));
+ mock_table_view_observer_.get(), std::move(mock_chooser_controller)));
table_view_ = chooser_content_view_->table_view_for_test();
ASSERT_TRUE(table_view_);
table_model_ = table_view_->model();
@@ -56,9 +60,9 @@ class ChooserContentViewTest : public testing::Test {
}
protected:
- std::unique_ptr<MockChooserController> mock_chooser_controller_;
std::unique_ptr<MockTableViewObserver> mock_table_view_observer_;
std::unique_ptr<ChooserContentView> chooser_content_view_;
+ MockChooserController* mock_chooser_controller_;
views::TableView* table_view_;
ui::TableModel* table_model_;
std::unique_ptr<MockStyledLabelListener> mock_styled_label_listener_;

Powered by Google App Engine
This is Rietveld 408576698