Attempt to fix ChromeFrameTestWithWebServer tests.

chrome_frame/test/chrome_frame_test_utils.h

 // 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.
 
 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
 #define CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
 
 #include <windows.h>
 
 #include <atlbase.h>
 #include <atlwin.h>
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/test/test_reg_util_win.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
 #include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/test_utils.h"
@@ skipping 162 matching lines @@
 // We need a UI message loop in the main thread.
 class TimedMsgLoop {
  public:
   TimedMsgLoop() : quit_loop_invoked_(false) {
   }
 
   void RunFor(int seconds) {
     QuitAfter(seconds);
     quit_loop_invoked_ = false;
     loop_.MessageLoop::Run();
+    quit_closure_.Cancel();
   }
 
   void PostTask(const tracked_objects::Location& from_here,
                 const base::Closure& task) {
     loop_.PostTask(from_here, task);
   }
 
   void PostDelayedTask(const tracked_objects::Location& from_here,
                        const base::Closure& task, int64 delay_ms) {
     loop_.PostDelayedTask(from_here, task, delay_ms);
   }
 
   void Quit() {
     QuitAfter(0);
   }
 
   void QuitAfter(int seconds) {
+    quit_closure_.Reset(MessageLoop::QuitClosure());
     quit_loop_invoked_ = true;
     loop_.PostDelayedTask(
-        FROM_HERE, MessageLoop::QuitClosure(), 1000 * seconds);
+        FROM_HERE, quit_closure_.callback(), 1000 * seconds);
   }
 
   bool WasTimedOut() const {
     return !quit_loop_invoked_;
   }
 
+  void RunAllPending() {
+    loop_.RunAllPending();
+  }
+
  private:
   MessageLoopForUI loop_;
+  base::CancelableClosure quit_closure_;
   bool quit_loop_invoked_;
 };
 
 // Saves typing. It's somewhat hard to create a wrapper around
 // testing::InvokeWithoutArgs since it returns a
 // non-public (testing::internal) type.
 #define QUIT_LOOP(loop) testing::InvokeWithoutArgs(\
   testing::CreateFunctor(&loop, &chrome_frame_test::TimedMsgLoop::Quit))
 
 #define QUIT_LOOP_SOON(loop, seconds) testing::InvokeWithoutArgs(\
@@ skipping 95 matching lines @@
 }  // namespace chrome_frame_test
 
 // TODO(tommi): This is a temporary workaround while we're getting our
 // Singleton story straight.  Ideally each test should clear up any singletons
 // it might have created, but test cases do not implicitly have their own
 // AtExitManager, so we have this workaround method for tests that depend on
 // "fresh" singletons.  The implementation is in chrome_frame_unittest_main.cc.
 void DeleteAllSingletons();
 
 #endif  // CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_