Revert of Decouple Media Service

content/common/gpu/gpu_channel_manager_unittest.cc

Index: content/common/gpu/gpu_channel_manager_unittest.cc
diff --git a/content/common/gpu/gpu_channel_manager_unittest.cc b/content/common/gpu/gpu_channel_manager_unittest.cc
index 2938b8d304fb74cd013b9b7ffb9fd48332ee5f71..b7dc1a7601aff6a829582ac7e54eae420c9b00ad 100644
--- a/content/common/gpu/gpu_channel_manager_unittest.cc
+++ b/content/common/gpu/gpu_channel_manager_unittest.cc
@@ -36,13 +36,12 @@
   params.preempts = false;
   params.allow_view_command_buffers = false;
   params.allow_real_time_streams = false;
-  IPC::ChannelHandle channel_handle =
-      channel_manager()->EstablishChannel(params);
-  EXPECT_NE("", channel_handle.name);
+  IPC::ChannelHandle handle = channel_manager()->EstablishChannel(params);
+  EXPECT_NE("", handle.name);
 
   GpuChannel* channel = channel_manager()->LookupChannel(kClientId);
   ASSERT_TRUE(channel);
-  EXPECT_EQ(channel_handle.name, channel->channel_id());
+  EXPECT_EQ(handle.name, channel->channel_id());
 }
 
 TEST_F(GpuChannelManagerTest, SecureValueStateForwarding) {