Revert of Properly route screen orientation IPC messages.

content/common/screen_orientation_messages.h

Index: content/common/screen_orientation_messages.h
diff --git a/content/common/screen_orientation_messages.h b/content/common/screen_orientation_messages.h
index b7336d6b65752aadf1f6369dbcfac7496965e5c4..5a845e7d50fb634b20fa5d7aa0e1cacefa4a657b 100644
--- a/content/common/screen_orientation_messages.h
+++ b/content/common/screen_orientation_messages.h
@@ -29,7 +29,6 @@
 
 // The browser process informs the renderer process that the screen orientation
 // has changed. |orientation| contains the new screen orientation in degrees.
-// TODO(mlamouri): we could probably get rid of it.
 IPC_MESSAGE_CONTROL1(ScreenOrientationMsg_OrientationChange,
                      blink::WebScreenOrientationType /* orientation */ )
 
@@ -37,28 +36,28 @@
 // the lock actually succeeded. The message includes the new |angle| and |type|
 // of orientation. The |request_id| passed when receiving the request is passed
 // back so the renderer process can associate the response to the right request.
-IPC_MESSAGE_ROUTED3(ScreenOrientationMsg_LockSuccess,
-                    int, /* request_id */
-                    unsigned, /* angle */
-                    blink::WebScreenOrientationType /* type */)
+IPC_MESSAGE_CONTROL3(ScreenOrientationMsg_LockSuccess,
+                     int, /* request_id */
+                     unsigned, /* angle */
+                     blink::WebScreenOrientationType /* type */)
 
 // The browser process' response to a ScreenOrientationHostMsg_LockRequest when
 // the lock actually failed. The message includes the |error| type. The
 // |request_id| passed when receiving the request is passed back so the renderer
 // process can associate the response to the right request.
-IPC_MESSAGE_ROUTED2(ScreenOrientationMsg_LockError,
-                    int, /* request_id */
-                    blink::WebLockOrientationCallback::ErrorType /* error */);
+IPC_MESSAGE_CONTROL2(ScreenOrientationMsg_LockError,
+                     int, /* request_id */
+                     blink::WebLockOrientationCallback::ErrorType /* error */);
 
 // The renderer process requests the browser process to lock the screen
 // orientation to the specified |orientations|. The request contains a
 // |request_id| that will have to be passed back to the renderer process when
 // notifying about a success or error (see ScreenOrientationMsg_LockError and
 // ScreenOrientationMsg_LockSuccess).
-IPC_MESSAGE_ROUTED2(ScreenOrientationHostMsg_LockRequest,
-                    blink::WebScreenOrientationLockType, /* orientation */
-                    int /* request_id */)
+IPC_MESSAGE_CONTROL2(ScreenOrientationHostMsg_LockRequest,
+                     blink::WebScreenOrientationLockType, /* orientation */
+                     int /* request_id */)
 
 // The renderer process requests the browser process to unlock the screen
 // orientation.
-IPC_MESSAGE_ROUTED0(ScreenOrientationHostMsg_Unlock)
+IPC_MESSAGE_CONTROL0(ScreenOrientationHostMsg_Unlock)