Attempt to fix ChromeFrameTestWithWebServer tests.

chrome_frame/test/chrome_frame_test_utils.h

Index: chrome_frame/test/chrome_frame_test_utils.h
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h
index 8affbd56431ce148784bc06078eb508b7923ff18..24c1df9d995154e69561e122e136d89f5cf1d99d 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -13,13 +13,18 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
+#include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
+#include "base/time.h"
 #include "base/test/test_reg_util_win.h"
+#include "base/time.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
+#include "chrome/test/base/ui_test_utils.h"
 #include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/test_utils.h"
@@ -53,8 +58,8 @@ extern const wchar_t kIEImageName[];
 extern const wchar_t kIEBrokerImageName[];
 extern const char kChromeImageName[];
 extern const wchar_t kChromeLauncher[];
-extern const int kChromeFrameLongNavigationTimeoutInSeconds;
-extern const int kChromeFrameVeryLongNavigationTimeoutInSeconds;
+extern const base::TimeDelta kChromeFrameLongNavigationTimeout;
+extern const base::TimeDelta kChromeFrameVeryLongNavigationTimeout;
 
 // Temporarily impersonate the current thread to low integrity for the lifetime
 // of the object. Destructor will automatically revert integrity level.
@@ -188,13 +193,22 @@ class HungCOMCallDetector
 // We need a UI message loop in the main thread.
 class TimedMsgLoop {
  public:
-  TimedMsgLoop() : quit_loop_invoked_(false) {
+  TimedMsgLoop() : snapshot_on_timeout_(false), quit_loop_invoked_(false) {
   }
 
-  void RunFor(int seconds) {
-    QuitAfter(seconds);
+  void set_snapshot_on_timeout(bool value) {
+    snapshot_on_timeout_ = value;
+  }
+
+  void RunFor(base::TimeDelta duration) {
     quit_loop_invoked_ = false;
+    if (snapshot_on_timeout_)
+      timeout_closure_.Reset(base::Bind(&TimedMsgLoop::SnapshotAndQuit));
+    else
+      timeout_closure_.Reset(MessageLoop::QuitClosure());
+    loop_.PostDelayedTask(FROM_HERE, timeout_closure_.callback(), duration);
     loop_.MessageLoop::Run();
+    timeout_closure_.Cancel();
   }
 
   void PostTask(const tracked_objects::Location& from_here,
@@ -208,21 +222,46 @@ class TimedMsgLoop {
   }
 
   void Quit() {
-    QuitAfter(0);
+    QuitAfter(base::TimeDelta());

[robertshield, 2012/04/11 17:03:36]

nit: add a comment to indicate that this means "quit now".

[grt (UTC plus 2), 2012/04/11 17:33:08]

Done.

   }
 
-  void QuitAfter(int seconds) {
+  void QuitAfter(base::TimeDelta delay) {
+    timeout_closure_.Cancel();
     quit_loop_invoked_ = true;
-    loop_.PostDelayedTask(
-        FROM_HERE, MessageLoop::QuitClosure(), 1000 * seconds);
+    loop_.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), delay);
   }
 
   bool WasTimedOut() const {
     return !quit_loop_invoked_;
   }
 
+  void RunAllPending() {
+    loop_.RunAllPending();
+  }
+
  private:
+  static void SnapshotAndQuit() {
+    FilePath snapshot;
+    if (ui_test_utils::SaveScreenSnapshotToDesktop(&snapshot)) {
+      testing::UnitTest* unit_test = testing::UnitTest::GetInstance();
+      const testing::TestInfo* test_info = unit_test->current_test_info();
+      std::string name;
+      if (test_info != NULL) {
+        name.append(test_info->test_case_name())
+            .append(1, '.')
+            .append(test_info->name());
+      } else {
+        name = "unknown test";
+      }
+      LOG(ERROR) << name << " timed out. Screen snapshot saved to "
+                 << snapshot.value();
+    }
+    MessageLoop::current()->Quit();
+  }
+
   MessageLoopForUI loop_;
+  base::CancelableClosure timeout_closure_;
+  bool snapshot_on_timeout_;
   bool quit_loop_invoked_;
 };
 
@@ -232,9 +271,9 @@ class TimedMsgLoop {
 #define QUIT_LOOP(loop) testing::InvokeWithoutArgs(\
   testing::CreateFunctor(&loop, &chrome_frame_test::TimedMsgLoop::Quit))
 
-#define QUIT_LOOP_SOON(loop, seconds) testing::InvokeWithoutArgs(\
+#define QUIT_LOOP_SOON(loop, delay) testing::InvokeWithoutArgs(\
   testing::CreateFunctor(&loop, &chrome_frame_test::TimedMsgLoop::QuitAfter, \
-  seconds))
+                         delay))
 
 // Launches IE as a COM server and returns the corresponding IWebBrowser2
 // interface pointer.
@@ -328,6 +367,10 @@ ScopedChromeFrameRegistrar::RegistrationType GetTestBedType();
 // Clears IE8 session restore history.
 void ClearIESessionHistory();
 
+// Returns a local IPv4 address for the current machine. The address
+// corresponding to a NIC is preferred over the loopback address.
+std::string GetLocalIPv4Address();
+
 }  // namespace chrome_frame_test
 
 // TODO(tommi): This is a temporary workaround while we're getting our