Commiting the changes from my previous cl that are specific to not including ...

chrome/browser/renderer_host/render_widget_host.h

Index: chrome/browser/renderer_host/render_widget_host.h
===================================================================
--- chrome/browser/renderer_host/render_widget_host.h	(revision 9176)
+++ chrome/browser/renderer_host/render_widget_host.h	(working copy)
@@ -11,7 +11,6 @@
 #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 {
@@ -255,8 +254,9 @@
   void OnMsgFocus();
   void OnMsgBlur();
   void OnMsgSetCursor(const WebCursor& cursor);
-  void OnMsgImeUpdateStatus(ViewHostMsg_ImeControl control,
-                            const gfx::Rect& caret_rect);
+  // 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);
 
   // Paints the given bitmap to the current backing store at the given location.
   void PaintBackingStoreRect(BitmapWireData bitmap,