Fix and re-enable slide-in/slide-out of infobars.

BUG=None
TEST=chrome_frame_unittests --gtest_filter=InfobarsInfobarWindowTest.SlidingTest

Review URL: http://codereview.chromium.org/6231006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71440 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 7 deletions

diff --git a/chrome_frame/infobars/internal/infobar_window.cc b/chrome_frame/infobars/internal/infobar_window.cc
index c2964f1..34b2c3d 100644
--- a/chrome_frame/infobars/internal/infobar_window.cc
+++ b/chrome_frame/infobars/internal/infobar_window.cc
@@ -22,7 +22,9 @@ const int kInfobarSlideCloseStep = 6;
 
 }  // namespace
 
-void OnSliderTimer(InfobarWindow::Host* host) {
+VOID CALLBACK OnSliderTimer(InfobarWindow::Host* host,
+                            HWND /*hwnd*/, UINT /*uMsg*/,
+                            UINT_PTR /*idEvent*/, DWORD /*dwTime*/) {
   if (host)
     host->UpdateLayout();
 }
@@ -139,8 +141,6 @@ void InfobarWindow::StartSlidingTowards(int target_height) {
 }
 
 bool InfobarWindow::StartTimer() {
-  return false;  // TODO(erikwright): Diagnose and fix crashes on IE.
-#if 0
   if (timer_id_ != 0)
     return true;
 
@@ -156,7 +156,6 @@ bool InfobarWindow::StartTimer() {
   DPLOG_IF(ERROR, timer_id_ == 0) << "Failure in SetTimer.";
 
   return timer_id_ != 0;
-#endif
 }
 
 bool InfobarWindow::StopTimer() {
diff --git a/chrome_frame/test/infobar_unittests.cc b/chrome_frame/test/infobar_unittests.cc
index 63aa898..1707d60 100644
--- a/chrome_frame/test/infobar_unittests.cc
+++ b/chrome_frame/test/infobar_unittests.cc
@@ -431,9 +431,7 @@ ACTION_P2(AsynchronousHideOnManager, loop, manager) {
 // If the test turns out to be flaky (i.e., because timers are not firing
 // frequently enough to hit all the ranges), increasing the infobar_height
 // should increase the margin (by increasing the time spent in each range).
-//
-// TODO(erikwright): re-enable when sliding is fixed (currently crashes in IE6).
-TEST(InfobarsInfobarWindowTest, DISABLED_SlidingTest) {
+TEST(InfobarsInfobarWindowTest, SlidingTest) {
   int infobar_height = 40;
 
   chrome_frame_test::TimedMsgLoop message_loop;