New unittests for infobar.

ceee/ie/plugin/bho/infobar_window.cc

 // Copyright (c) 2010 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.
 //
 // Implementation of the manager for infobar windows.
 
 #include "ceee/ie/plugin/bho/infobar_window.h"
 
 #include <atlapp.h>
 #include <atlcrack.h>
@@ skipping 23 matching lines @@
   DCHECK(delegate);
   return NULL == delegate ? NULL : new InfobarWindow(type, delegate);
 }
 
 InfobarWindow::InfobarWindow(InfobarType type, Delegate* delegate)
     : type_(type),
       delegate_(delegate),
       show_(false),
       target_height_(1),
       current_height_(1),
-      sliding_infobar_(false) {
+      sliding_infobar_(false),
+      timer_id_(0) {
   DCHECK(delegate);
 }
 
 InfobarWindow::~InfobarWindow() {
   Reset();
 
   if (IsWindow()) {
     DestroyWindow();
   } else {
     NOTREACHED() << "Infobar window was not successfully created.";
@@ skipping 103 matching lines @@
       target_height_ = 1;
     }
   } else {
     target_height_ = 1;
   }
 
   if (!slide || !show) {
     current_height_ = target_height_;
 
     if (sliding_infobar_) {
-      KillTimer(kInfobarSlidingTimerId);
+      KillTimer(timer_id_);
       sliding_infobar_ = false;
     }
   } else {
     // If the infobar is visible and sliding effect is requested, we need to
     // start expanding/shrinking the infobar according to its current height.
     current_height_ = CalculateNextHeight();
 
     if (!sliding_infobar_) {
-      SetTimer(kInfobarSlidingTimerId, kInfobarSlidingTimerIntervalMs, NULL);
+      // Set timer and store its id (it could be different from the passed one).
+      timer_id_ = SetTimer(kInfobarSlidingTimerId,
+                           kInfobarSlidingTimerIntervalMs, NULL);
       sliding_infobar_ = true;
     }
   }
 
   UpdateLayout();
 }
 
 int InfobarWindow::CalculateNextHeight() {
   if (current_height_ < target_height_) {
     return std::min(current_height_ + kInfobarSlidingStep, target_height_);
@@ skipping 63 matching lines @@
     return E_POINTER;
 
   // Set the size to 0 that means we do not know it.
   // TODO(vadimb@google.com): Find how to get the content size from the CF.
   size->cx = 0;
   size->cy = 0;
   return S_OK;
 }
 
 LRESULT InfobarWindow::OnTimer(UINT_PTR nIDEvent) {
-  DCHECK(nIDEvent == kInfobarSlidingTimerId);
+  DCHECK(nIDEvent == timer_id_);
   if (show_ && sliding_infobar_ && current_height_ != target_height_) {
     current_height_ = CalculateNextHeight();
     UpdateLayout();
   } else if (sliding_infobar_) {
-    KillTimer(kInfobarSlidingTimerId);
+    KillTimer(timer_id_);
     sliding_infobar_ = false;
   }
 
   return S_OK;
 }
 
 LRESULT InfobarWindow::OnCreate(LPCREATESTRUCT lpCreateStruct) {
   InitializingCoClass<InfobarBrowserWindow>::CreateInitialized(
       CComBSTR(url_.c_str()), this, &chrome_frame_host_);
 
@@ skipping 26 matching lines @@
 
 void InfobarWindow::AdjustSize() {
   if (NULL != chrome_frame_host_) {
     CRect rect;
     GetClientRect(&rect);
     chrome_frame_host_->SetWindowSize(rect.Width(), rect.Height());
   }
 }
 
 }  // namespace infobar_api