Refactor and clean up code now that chrome::testing::NSRunLoopRunAllPending() exists.

chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

 // Copyright (c) 2011 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 "base/memory/scoped_nsobject.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
+#include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
-// Override to avoid dealing with run loops in the testing environment.
-@implementation WrenchMenuController (UnitTesting)
-- (void)dispatchCommandInternal:(NSInteger)tag {
-  [self wrenchMenuModel]->ExecuteCommand(tag);
-}
-@end
-
-
 namespace {
 
 class MockWrenchMenuModel : public WrenchMenuModel {
  public:
   MockWrenchMenuModel() : WrenchMenuModel() {}
   ~MockWrenchMenuModel() {
     // This dirty, ugly hack gets around a bug in the test. In
     // ~WrenchMenuModel(), there's a call to TabstripModel::RemoveObserver(this)
     // which mysteriously leads to this crash: http://crbug.com/49206 .  It
     // seems that the vector of observers is getting hosed somewhere between
@@ skipping 37 matching lines @@
 
 TEST_F(WrenchMenuControllerTest, DispatchSimple) {
   scoped_nsobject<NSButton> button([[NSButton alloc] init]);
   [button setTag:IDC_ZOOM_PLUS];
 
   // Set fake model to test dispatching.
   EXPECT_CALL(fake_model_, ExecuteCommand(IDC_ZOOM_PLUS));
   [controller() setModel:&fake_model_];
 
   [controller() dispatchWrenchMenuCommand:button.get()];
+  chrome::testing::NSRunLoopRunAllPending();
 }
 
 }  // namespace