Revert of Properly route screen orientation IPC messages.

content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc

Index: content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc
diff --git a/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc b/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc
index 461533e6304229baf702bf72ffad578508968462..2bc542bc8f3e11f3731503bd5d1ad8c0b4bfe72b 100644
--- a/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc
+++ b/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc
@@ -105,11 +105,6 @@
     dispatcher_->OnMessageReceived(message);
   }
 
-  int routing_id() const {
-    // We return a fake routing_id() in the context of this test.
-    return 0;
-  }
-
   IPC::TestSink sink_;
   scoped_ptr<ScreenOrientationDispatcher> dispatcher_;
 };
@@ -161,8 +156,7 @@
                     new MockLockOrientationCallback(&callback_results));
 
     int request_id = GetFirstLockRequestIdFromSink();
-    OnMessageReceived(
-        ScreenOrientationMsg_LockError(routing_id(), request_id, *it));
+    OnMessageReceived(ScreenOrientationMsg_LockError(request_id, *it));
 
     EXPECT_FALSE(callback_results.succeeded_);
     EXPECT_TRUE(callback_results.failed_);
@@ -193,8 +187,7 @@
                     new MockLockOrientationCallback(&callback_results));
 
     int request_id = GetFirstLockRequestIdFromSink();
-    OnMessageReceived(ScreenOrientationMsg_LockSuccess(routing_id(),
-                                                       request_id,
+    OnMessageReceived(ScreenOrientationMsg_LockSuccess(request_id,
                                                        orientations[i].angle,
                                                        orientations[i].type));
 
@@ -216,7 +209,6 @@
 
   int request_id = GetFirstLockRequestIdFromSink();
   OnMessageReceived(ScreenOrientationMsg_LockSuccess(
-      routing_id(),
       request_id + 1,
       90,
       blink::WebScreenOrientationLandscapePrimary));
@@ -234,7 +226,6 @@
 
   int request_id = GetFirstLockRequestIdFromSink();
   OnMessageReceived(ScreenOrientationMsg_LockError(
-      routing_id(),
       request_id + 1,
       blink::WebLockOrientationCallback::ErrorTypeCanceled));
 
@@ -262,7 +253,6 @@
   // callback_results1 must be rejected, tested in CancelPending_DoubleLock.
 
   OnMessageReceived(ScreenOrientationMsg_LockSuccess(
-      routing_id(),
       request_id1,
       0,
       blink::WebScreenOrientationPortraitPrimary));