MacViews: Correct combobox unittests so that they terminate correctly.

ui/views/controls/combobox/combobox_unittest.cc

 // 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.
 
 #include "ui/views/controls/combobox/combobox.h"
 
 #include <set>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 167 matching lines @@
   int actions_performed_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestComboboxListener);
 };
 
 }  // namespace
 
 class ComboboxTest : public ViewsTestBase {
  public:
-  ComboboxTest() : widget_(NULL), combobox_(NULL) {}
+  ComboboxTest() {}
 
   void TearDown() override {
     if (widget_)
       widget_->Close();
     ViewsTestBase::TearDown();
   }
 
   void InitCombobox(const std::set<int>* separators, Combobox::Style style) {
     model_.reset(new TestComboboxModel());
 
     if (separators)
       model_->SetSeparators(*separators);
 
     ASSERT_FALSE(combobox_);
     combobox_ = new TestCombobox(model_.get(), style);
     test_api_.reset(new ComboboxTestApi(combobox_));
+    test_api_->InstallTestMenuRunner(&menu_show_count_);
     combobox_->set_id(1);
 
     widget_ = new Widget;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(200, 200, 200, 200);
     widget_->Init(params);
     View* container = new View();
     widget_->SetContentsView(container);
     container->AddChildView(combobox_);
     widget_->Show();
@@ skipping 32 matching lines @@
         ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
     widget_->OnMouseEvent(&released_event);
   }
 
   void PerformClick(const gfx::Point& point) {
     PerformMousePress(point);
     PerformMouseRelease(point);
   }
 
   // We need widget to populate wrapper class.
-  Widget* widget_;
+  Widget* widget_ = nullptr;
 
   // |combobox_| will be allocated InitCombobox() and then owned by |widget_|.
-  TestCombobox* combobox_;
+  TestCombobox* combobox_ = nullptr;
   std::unique_ptr<ComboboxTestApi> test_api_;
 
   // Combobox does not take ownership of the model, hence it needs to be scoped.
   std::unique_ptr<TestComboboxModel> model_;
 
+  // The current menu show count.
+  int menu_show_count_ = 0;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ComboboxTest);
 };
 
 TEST_F(ComboboxTest, KeyTest) {
   InitCombobox(nullptr, Combobox::STYLE_NORMAL);
   SendKeyEvent(ui::VKEY_END);
   EXPECT_EQ(combobox_->selected_index() + 1, model_->GetItemCount());
   SendKeyEvent(ui::VKEY_HOME);
   EXPECT_EQ(combobox_->selected_index(), 0);
@@ skipping 220 matching lines @@
   combobox->set_listener(evil_listener.get());
   ASSERT_NO_FATAL_FAILURE(ComboboxTestApi(combobox).PerformActionAt(2));
   EXPECT_TRUE(evil_listener->deleted());
 }
 
 TEST_F(ComboboxTest, Click) {
   InitCombobox(nullptr, Combobox::STYLE_NORMAL);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
-
   combobox_->Layout();
-  int menu_show_count = 0;
-  test_api_->InstallTestMenuRunner(&menu_show_count);
 
   // Click the left side. The menu is shown.
-  EXPECT_EQ(0, menu_show_count);
+  EXPECT_EQ(0, menu_show_count_);
   PerformClick(gfx::Point(combobox_->x() + 1,
                           combobox_->y() + combobox_->height() / 2));
   EXPECT_FALSE(listener.on_perform_action_called());
-  EXPECT_EQ(1, menu_show_count);
+  EXPECT_EQ(1, menu_show_count_);
 }
 
 TEST_F(ComboboxTest, ClickButDisabled) {
   InitCombobox(nullptr, Combobox::STYLE_NORMAL);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
   combobox_->Layout();
   combobox_->SetEnabled(false);
 
   // Click the left side, but nothing happens since the combobox is disabled.
-  int menu_show_count = 0;
-  test_api_->InstallTestMenuRunner(&menu_show_count);
   PerformClick(gfx::Point(combobox_->x() + 1,
                           combobox_->y() + combobox_->height() / 2));
   EXPECT_FALSE(listener.on_perform_action_called());
-  EXPECT_EQ(0, menu_show_count);
+  EXPECT_EQ(0, menu_show_count_);
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithReturnKey) {
   InitCombobox(nullptr, Combobox::STYLE_NORMAL);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
-  // With STYLE_NORMAL, the click event is ignored.
+  // With STYLE_NORMAL, the click event is ignored. Instead the menu is shown.
   SendKeyEvent(ui::VKEY_RETURN);
+  EXPECT_EQ(1, menu_show_count_);
   EXPECT_FALSE(listener.on_perform_action_called());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithReturnKeyActionStyle) {
   InitCombobox(nullptr, Combobox::STYLE_ACTION);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
-  // With STYLE_ACTION, the click event is notified.
+  // With STYLE_ACTION, the click event is notified and the menu is not shown.
   SendKeyEvent(ui::VKEY_RETURN);
+  EXPECT_EQ(0, menu_show_count_);
   EXPECT_TRUE(listener.on_perform_action_called());
   EXPECT_EQ(0, listener.perform_action_index());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithSpaceKey) {
   InitCombobox(nullptr, Combobox::STYLE_NORMAL);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
-  // With STYLE_NORMAL, the click event is ignored.
+  // With STYLE_NORMAL, the click event is ignored. Instead the menu is shwon.
   SendKeyEvent(ui::VKEY_SPACE);
+  EXPECT_EQ(1, menu_show_count_);
   EXPECT_FALSE(listener.on_perform_action_called());
+
   SendKeyEventWithType(ui::VKEY_SPACE, ui::ET_KEY_RELEASED);
+  EXPECT_EQ(1, menu_show_count_);
   EXPECT_FALSE(listener.on_perform_action_called());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithSpaceKeyActionStyle) {
   InitCombobox(nullptr, Combobox::STYLE_ACTION);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
-  // With STYLE_ACTION, the click event is notified after releasing.
+  // With STYLE_ACTION, the click event is notified after releasing and the menu
+  // is not shown.
   SendKeyEvent(ui::VKEY_SPACE);
+  EXPECT_EQ(0, menu_show_count_);
   EXPECT_FALSE(listener.on_perform_action_called());
+
   SendKeyEventWithType(ui::VKEY_SPACE, ui::ET_KEY_RELEASED);
+  EXPECT_EQ(0, menu_show_count_);
   EXPECT_TRUE(listener.on_perform_action_called());
   EXPECT_EQ(0, listener.perform_action_index());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithMouse) {
   InitCombobox(nullptr, Combobox::STYLE_ACTION);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
   combobox_->Layout();
 
   // Click the right side (arrow button). The menu is shown.
-  int menu_show_count = 0;
-  test_api_->InstallTestMenuRunner(&menu_show_count);
   const gfx::Point right_point(combobox_->x() + combobox_->width() - 1,
                          combobox_->y() + combobox_->height() / 2);
 
-  EXPECT_EQ(0, menu_show_count);
+  EXPECT_EQ(0, menu_show_count_);
 
 // On Mac, actions occur on mouse down. Otherwise mouse up.
 #if defined(OS_MACOSX)
   const int kActOnMouseDown = 1;
 #else
   const int kActOnMouseDown = 0;
 #endif
 
   PerformMousePress(right_point);
-  EXPECT_EQ(kActOnMouseDown, menu_show_count);
+  EXPECT_EQ(kActOnMouseDown, menu_show_count_);
   PerformMouseRelease(right_point);
-  EXPECT_EQ(1, menu_show_count);
+  EXPECT_EQ(1, menu_show_count_);
 
   // Click the left side (text button). The click event is notified.
   const gfx::Point left_point(
       gfx::Point(combobox_->x() + 1, combobox_->y() + combobox_->height() / 2));
-  test_api_->InstallTestMenuRunner(&menu_show_count);
 
   PerformMousePress(left_point);
   PerformMouseRelease(left_point);
 
-  EXPECT_EQ(1, menu_show_count);  // Unchanged.
+  EXPECT_EQ(1, menu_show_count_);  // Unchanged.
   EXPECT_EQ(0, listener.perform_action_index());
 }
 
 TEST_F(ComboboxTest, ConsumingPressKeyEvents) {
   InitCombobox(nullptr, Combobox::STYLE_NORMAL);
 
-  int menu_show_count = 0;
-  test_api_->InstallTestMenuRunner(&menu_show_count);
   EXPECT_TRUE(combobox_->OnKeyPressed(
       ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, ui::EF_NONE)));
-  EXPECT_EQ(1, menu_show_count);
+  EXPECT_EQ(1, menu_show_count_);
   EXPECT_TRUE(combobox_->OnKeyPressed(
       ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_SPACE, ui::EF_NONE)));
-  EXPECT_EQ(2, menu_show_count);
+  EXPECT_EQ(2, menu_show_count_);
 }
 
 TEST_F(ComboboxTest, ConsumingKeyPressEventsActionStyle) {
   // When the combobox's style is STYLE_ACTION, pressing events of a space key
-  // or an enter key will be consumed.
+  // or an enter key will be consumed and the menu is not shown.
   InitCombobox(nullptr, Combobox::STYLE_ACTION);
+
   EXPECT_TRUE(combobox_->OnKeyPressed(
       ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, ui::EF_NONE)));
+  EXPECT_EQ(0, menu_show_count_);
   EXPECT_TRUE(combobox_->OnKeyPressed(
       ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_SPACE, ui::EF_NONE)));
+  EXPECT_EQ(0, menu_show_count_);
 }
 
 TEST_F(ComboboxTest, ContentWidth) {
   std::vector<std::string> values;
   VectorComboboxModel model(&values);
   TestCombobox combobox(&model, Combobox::STYLE_NORMAL);
   TestCombobox action_combobox(&model, Combobox::STYLE_ACTION);
   ComboboxTestApi test_api(&combobox);
   ComboboxTestApi action_test_api(&action_combobox);
 
@@ skipping 160 matching lines @@
   EXPECT_EQ(ui::MenuModel::TYPE_COMMAND, menu_model->GetTypeAt(0));
   EXPECT_EQ(ui::MenuModel::TYPE_COMMAND, menu_model->GetTypeAt(1));
 
   EXPECT_EQ(ASCIIToUTF16("PEANUT BUTTER"), menu_model->GetLabelAt(0));
   EXPECT_EQ(ASCIIToUTF16("JELLY"), menu_model->GetLabelAt(1));
   EXPECT_FALSE(menu_model->IsVisibleAt(0));
   EXPECT_TRUE(menu_model->IsVisibleAt(1));
 }
 
 }  // namespace views