Cleanup MenuRunner API

ui/views/test/combobox_test_api.cc

 // Copyright 2015 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/test/combobox_test_api.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/menu_runner_handler.h"
 #include "ui/views/test/menu_runner_test_api.h"
 
 namespace views {
 namespace test {
 namespace {
 
 // An dummy implementation of MenuRunnerHandler to check if the dropdown menu is
 // shown or not.
 class TestMenuRunnerHandler : public MenuRunnerHandler {
  public:
   explicit TestMenuRunnerHandler(int* show_counter)
       : show_counter_(show_counter) {}
-  MenuRunner::RunResult RunMenuAt(Widget* parent,
-                                  MenuButton* button,
-                                  const gfx::Rect& bounds,
-                                  MenuAnchorPosition anchor,
-                                  ui::MenuSourceType source_type,
-                                  int32_t types) override {
+  void RunMenuAt(Widget* parent,
+                 MenuButton* button,
+                 const gfx::Rect& bounds,
+                 MenuAnchorPosition anchor,
+                 ui::MenuSourceType source_type,
+                 int32_t types) override {
     *show_counter_ += 1;
-    return MenuRunner::NORMAL_EXIT;
   }
 
  private:
   int* show_counter_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMenuRunnerHandler);
 };
 
 }  // namespace
 
@@ skipping 12 matching lines @@
 gfx::Size ComboboxTestApi::content_size() {
   return combobox_->content_size_;
 }
 
 ui::MenuModel* ComboboxTestApi::menu_model() {
   return combobox_->menu_model_.get();
 }
 
 }  // test
 }  // views