Make ComboboxListener work around being deleted from OnSelectedIndexChanged().

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/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
+#include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/ime/mock_input_method.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
+namespace views {
+
 namespace {
 
 // A wrapper of Combobox to intercept the result of OnKeyPressed() and
 // OnKeyReleased() methods.
-class TestCombobox : public views::Combobox {
+class TestCombobox : public Combobox {
  public:
   explicit TestCombobox(ui::ComboboxModel* model)
       : Combobox(model),
         key_handled_(false),
         key_received_(false) {
   }
 
   virtual bool OnKeyPressed(const ui::KeyEvent& e) OVERRIDE {
     key_received_ = true;
-    key_handled_ = views::Combobox::OnKeyPressed(e);
+    key_handled_ = Combobox::OnKeyPressed(e);
     return key_handled_;
   }
 
   virtual bool OnKeyReleased(const ui::KeyEvent& e) OVERRIDE {
     key_received_ = true;
-    key_handled_ = views::Combobox::OnKeyReleased(e);
+    key_handled_ = Combobox::OnKeyReleased(e);
     return key_handled_;
   }
 
   bool key_handled() const { return key_handled_; }
   bool key_received() const { return key_received_; }
 
   void clear() {
     key_received_ = key_handled_ = false;
   }
 
@@ skipping 28 matching lines @@
   void SetSeparators(const std::set<int>& separators) {
     separators_ = separators;
   }
 
  private:
   std::set<int> separators_;
 
   DISALLOW_COPY_AND_ASSIGN(TestComboboxModel);
 };
 
+class EvilListener : public ComboboxListener {
+ public:
+  EvilListener() : deleted_(false) {};
+  virtual ~EvilListener() {};
+
+  // ComboboxListener:
+  virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE {
+    delete combobox;
+    deleted_ = true;
+  }
+
+  bool deleted() const { return deleted_; }
+
+ private:
+  bool deleted_;
+
+  DISALLOW_COPY_AND_ASSIGN(EvilListener);
+};
+
 }  // namespace
 
-namespace views {
-
 class ComboboxTest : public ViewsTestBase {
  public:
   ComboboxTest() : widget_(NULL), combobox_(NULL), input_method_(NULL) {}
 
   virtual void TearDown() OVERRIDE {
     if (widget_)
       widget_->Close();
     ViewsTestBase::TearDown();
   }
 
@@ skipping 233 matching lines @@
   InitCombobox();
   ASSERT_EQ(model_->GetDefaultIndex(), combobox_->selected_index());
   EXPECT_TRUE(combobox_->SelectValue(ASCIIToUTF16("PEANUT BUTTER")));
   EXPECT_EQ(0, combobox_->selected_index());
   EXPECT_TRUE(combobox_->SelectValue(ASCIIToUTF16("JELLY")));
   EXPECT_EQ(1, combobox_->selected_index());
   EXPECT_FALSE(combobox_->SelectValue(ASCIIToUTF16("BANANAS")));
   EXPECT_EQ(1, combobox_->selected_index());
 }
 
+TEST_F(ComboboxTest, ListenerHandlesDelete) {
+  TestComboboxModel model;
+  TestCombobox* combobox = new TestCombobox(&model);  // Deleted on change.
+  EvilListener evil_listener;
+  combobox->set_listener(&evil_listener);
+  ASSERT_NO_FATAL_FAILURE(combobox->ExecuteCommand(2));
+  EXPECT_TRUE(evil_listener.deleted());
+}
+
 }  // namespace views