Revert of Decouple browser-specific GPU IPC messages from GPU service IPCs

content/common/gpu/gpu_channel_unittest.cc

Index: content/common/gpu/gpu_channel_unittest.cc
diff --git a/content/common/gpu/gpu_channel_unittest.cc b/content/common/gpu/gpu_channel_unittest.cc
index 2b0ba2c12886a1694e3973c7ff9ed0f88a562085..cecd765fd70ebd603f2c6086378961be541b3bbb 100644
--- a/content/common/gpu/gpu_channel_unittest.cc
+++ b/content/common/gpu/gpu_channel_unittest.cc
@@ -5,7 +5,6 @@
 #include <stdint.h>
 
 #include "base/test/test_simple_task_runner.h"
-#include "content/common/gpu/establish_channel_params.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_channel_test_common.h"
@@ -24,22 +23,23 @@
                             bool allow_real_time_streams) {
     DCHECK(channel_manager());
     uint64_t kClientTracingId = 1;
-    EstablishChannelParams params;
+    GpuMsg_EstablishChannel_Params params;
     params.client_id = client_id;
     params.client_tracing_id = kClientTracingId;
     params.preempts = false;
     params.allow_view_command_buffers = allow_view_command_buffers;
     params.allow_real_time_streams = allow_real_time_streams;
-    channel_manager()->EstablishChannel(params);
+    EXPECT_TRUE(
+        channel_manager()->OnMessageReceived(GpuMsg_EstablishChannel(params)));
+    sink()->ClearMessages();
     return channel_manager()->LookupChannel(client_id);
   }
 
   void HandleMessage(GpuChannel* channel, IPC::Message* msg) {
-    TestGpuChannel* test_channel = static_cast<TestGpuChannel*>(channel);
-    test_channel->HandleMessageForTesting(*msg);
+    channel->HandleMessageForTesting(*msg);
 
     if (msg->is_sync()) {
-      const IPC::Message* reply_msg = test_channel->sink()->GetMessageAt(0);
+      const IPC::Message* reply_msg = sink()->GetMessageAt(0);
       ASSERT_TRUE(reply_msg);
 
       EXPECT_TRUE(IPC::SyncMessage::IsMessageReplyTo(
@@ -52,7 +52,7 @@
 
       delete deserializer;
 
-      test_channel->sink()->ClearMessages();
+      sink()->ClearMessages();
     }
 
     delete msg;