Revert 48186, 48196, 48198

chrome/browser/automation/ui_controls_win.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/automation/ui_controls.h"
 
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/win_util.h"
 #include "base/ref_counted.h"
@@ skipping 164 matching lines @@
     ::SendMessage(popup_menu, WM_KEYDOWN, w_param, l_param);
     ::SendMessage(popup_menu, WM_KEYUP, w_param, l_param);
 
     if (dispatcher.get())
       dispatcher->AddRef();
     return true;
   }
 
   INPUT input[8] = { 0 }; // 8, assuming all the modifiers are activated
 
-  UINT i = 0;
+  int i = 0;
   if (control) {
     if (!FillKeyboardInput(base::VKEY_CONTROL, &input[i], false))
       return false;
     i++;
   }
 
   if (shift) {
     if (!FillKeyboardInput(base::VKEY_SHIFT, &input[i], false))
       return false;
     i++;
@@ skipping 24 matching lines @@
       return false;
     i++;
   }
 
   if (control) {
     if (!FillKeyboardInput(base::VKEY_CONTROL, &input[i], true))
       return false;
     i++;
   }
 
-  if (::SendInput(i, input, sizeof(INPUT) != i))
+  unsigned int rv = ::SendInput(i, input, sizeof(INPUT));
+
+  if (rv != i)
     return false;
 
   if (dispatcher.get())
     dispatcher->AddRef();
   return true;
 }
 
 bool SendMouseMoveImpl(long x, long y, Task* task) {
   // First check if the mouse is already there.
   POINT current_pos;
@@ skipping 119 matching lines @@
                                int state, Task* task) {
   DCHECK(view);
   DCHECK(view->GetWidget());
   gfx::Point view_center(view->width() / 2, view->height() / 2);
   views::View::ConvertPointToScreen(view, &view_center);
   SendMouseMove(view_center.x(), view_center.y());
   SendMouseEventsNotifyWhenDone(button, state, task);
 }
 
 }  // ui_controls