ToolbarButton: Reset menu runner before deleting its menu's delegate

chrome/test/base/view_event_test_base.cc

 // Copyright (c) 2012 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 "chrome/test/base/view_event_test_base.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 13 matching lines @@
 // View subclass that allows you to specify the preferred size.
 class TestView : public views::View {
  public:
   explicit TestView(ViewEventTestBase* harness) : harness_(harness) {}
 
   gfx::Size GetPreferredSize() const override {
     return harness_->GetPreferredSize();
   }
 
   void Layout() override {
+    // Permit a test to remove the view being tested from the hierarchy, then
+    // still handle a _NET_WM_STATE event on Linux during teardown that triggers
+    // layout.
+    if (!has_children())
+      return;
+
     View* child_view = child_at(0);
     child_view->SetBounds(0, 0, width(), height());
   }
 
  private:
   ViewEventTestBase* harness_;
 
   DISALLOW_COPY_AND_ASSIGN(TestView);
 };
 
@@ skipping 111 matching lines @@
   dnd_thread_.reset(NULL);
 }
 
 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
   task.Run();
   if (HasFatalFailure())
     Done();
 }