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

content/common/gpu/gpu_channel_unittest.cc

 // Copyright (c) 2015 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.
 
 #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"
 #include "content/common/gpu/gpu_messages.h"
 #include "ipc/ipc_test_sink.h"
 
 namespace content {
 
 class GpuChannelTest : public GpuChannelTestCommon {
  public:
   GpuChannelTest() : GpuChannelTestCommon() {}
   ~GpuChannelTest() override {}
 
   GpuChannel* CreateChannel(int32_t client_id,
                             bool allow_view_command_buffers,
                             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(
           *reply_msg, IPC::SyncMessage::GetMessageId(*msg)));
 
       IPC::MessageReplyDeserializer* deserializer =
           static_cast<IPC::SyncMessage*>(msg)->GetReplyDeserializer();
       ASSERT_TRUE(deserializer);
       deserializer->SerializeOutputParameters(*reply_msg);
 
       delete deserializer;
 
-      test_channel->sink()->ClearMessages();
+      sink()->ClearMessages();
     }
 
     delete msg;
   }
 };
 
 TEST_F(GpuChannelTest, CreateViewCommandBufferAllowed) {
   int32_t kClientId = 1;
   bool allow_view_command_buffers = true;
   GpuChannel* channel =
@@ skipping 213 matching lines @@
   HandleMessage(channel,
                 new GpuChannelMsg_CreateOffscreenCommandBuffer(
                     gfx::Size(1, 1), init_params, kRouteId, &succeeded));
   EXPECT_TRUE(succeeded);
 
   GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId);
   EXPECT_TRUE(stub);
 }
 
 }  // namespace content