Use TimeDelta for Chrome Frame test's TimedMsgLoop.

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/compiler_specific.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/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"
 #include "chrome_frame/utils.h"
 
 #include "gtest/gtest.h"
 
@@ skipping 16 matching lines @@
 // The return value is the number of windows closed.
 // @note: this function requires COM to be initialized on the calling thread.
 // Since the caller might be running in either MTA or STA, the function does
 // not perform this initialization itself.
 int CloseAllIEWindows();
 
 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.
 class LowIntegrityToken {
  public:
   LowIntegrityToken();
   ~LowIntegrityToken();
   BOOL Impersonate();
   BOOL RevertToSelf();
  protected:
@@ skipping 116 matching lines @@
   base::win::ScopedComPtr<IMessageFilter> prev_filter_;
 };
 
 // MessageLoopForUI wrapper that runs only for a limited time.
 // We need a UI message loop in the main thread.
 class TimedMsgLoop {
  public:
   TimedMsgLoop() : quit_loop_invoked_(false) {
   }
 
-  void RunFor(int seconds) {
-    QuitAfter(seconds);
+  void RunFor(base::TimeDelta duration) {
+    QuitAfter(duration);
     quit_loop_invoked_ = false;
     loop_.MessageLoop::Run();
   }
 
   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);
+    QuitAfter(base::TimeDelta());
   }
 
-  void QuitAfter(int seconds) {
+  void QuitAfter(base::TimeDelta delay) {
     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_;
   }
 
  private:
   MessageLoopForUI loop_;
   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(\
+#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.
 // Returns S_OK on success.
 HRESULT LaunchIEAsComServer(IWebBrowser2** web_browser);
 
 FilePath GetProfilePath(const std::wstring& suffix);
 
 // Returns the path of the exe passed in.
 std::wstring GetExecutableAppPath(const std::wstring& file);
@@ skipping 83 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_