Revert my change to get the tree green. Not sure why the tests became flaky....

chrome/browser/renderer_host/render_widget_host.h

 // 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
 
 #include <vector>
 
 #include "base/gfx/size.h"
 #include "base/timer.h"
 #include "chrome/common/bitmap_wire_data.h"
 #include "chrome/common/ipc_channel.h"
+#include "chrome/common/render_messages.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace gfx {
 class Rect;
 }
 
 class BackingStore;
 class PaintObserver;
 class RenderProcessHost;
 class RenderWidgetHostView;
@@ skipping 223 matching lines @@
   void OnMsgRendererReady();
   void OnMsgRendererGone();
   void OnMsgClose();
   void OnMsgRequestMove(const gfx::Rect& pos);
   void OnMsgPaintRect(const ViewHostMsg_PaintRect_Params& params);
   void OnMsgScrollRect(const ViewHostMsg_ScrollRect_Params& params);
   void OnMsgInputEventAck(const IPC::Message& message);
   void OnMsgFocus();
   void OnMsgBlur();
   void OnMsgSetCursor(const WebCursor& cursor);
-  // Using int instead of ViewHostMsg_ImeControl for control's type to avoid
-  // having to bring in render_messages.h in a header file.
-  void OnMsgImeUpdateStatus(int control, const gfx::Rect& caret_rect);
+  void OnMsgImeUpdateStatus(ViewHostMsg_ImeControl control,
+                            const gfx::Rect& caret_rect);
 
   // Paints the given bitmap to the current backing store at the given location.
   void PaintBackingStoreRect(BitmapWireData bitmap,
                              const gfx::Rect& bitmap_rect,
                              const gfx::Size& view_size);
 
   // Scrolls the given |clip_rect| in the backing by the given dx/dy amount. The
   // |bitmap| and its corresponding location |bitmap_rect| in the backing store
   // is the newly painted pixels by the renderer.
   void ScrollBackingStoreRect(BitmapWireData bitmap,
@@ skipping 70 matching lines @@
   bool view_being_painted_;
 
   // Used for UMA histogram logging to measure the time for a repaint view
   // operation to finish.
   base::TimeTicks repaint_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHost);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_