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

chrome/browser/ui/cocoa/infobars/infobar_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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #include "chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h"
 #include "chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.h"
+#include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 @interface InfoBarController (ExposedForTesting)
 - (NSString*)labelString;
 - (NSRect)labelFrame;
 @end
 
 @implementation InfoBarController (ExposedForTesting)
 - (NSString*)labelString {
@@ skipping 164 matching lines @@
   EXPECT_FALSE(closed_delegate_link_clicked_);
 }
 
 TEST_F(LinkInfoBarControllerTest, ShowAndClickLink) {
   // Check that clicking on the link calls LinkClicked() on the
   // delegate.  It should also close the infobar.
   [controller_ linkClicked];
 
   // Spin the runloop because the invocation for closing the infobar is done on
   // a 0-timer delayed selector.
-  [[NSRunLoop currentRunLoop] runUntilDate:
-      [NSDate dateWithTimeIntervalSinceNow:0.1]];

[Mark Mentovai, 2011/08/22 19:44:57]

ha.

+  chrome::testing::NSRunLoopRunAllPending();
 
   ASSERT_TRUE(delegate_closed());
   EXPECT_TRUE(closed_delegate_link_clicked_);
 }
 
 TEST_F(LinkInfoBarControllerTest, ShowAndClickLinkWithoutClosing) {
   delegate_->set_dont_close_on_action();
 
   // Check that clicking on the link calls LinkClicked() on the
   // delegate.  It should not close the infobar.
@@ skipping 102 matching lines @@
   const CGFloat width = 20;
   NSRect newViewFrame = [[controller_ view] frame];
   newViewFrame.size.width += width;
   [[controller_ view] setFrame:newViewFrame];
 
   NSRect newLabelFrame = [controller_ labelFrame];
   EXPECT_EQ(NSWidth(newLabelFrame), NSWidth(originalLabelFrame) + width);
 }
 
 }  // namespace