Revert of Decouple Media Service

content/common/gpu/gpu_channel_manager_unittest.cc

 // Copyright (c) 2014 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 <stddef.h>
 #include <stdint.h>
 
 #include "content/common/gpu/establish_channel_params.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
@@ skipping 18 matching lines @@
   uint64_t kClientTracingId = 1;
 
   ASSERT_TRUE(channel_manager());
 
   EstablishChannelParams params;
   params.client_id = kClientId;
   params.client_tracing_id = kClientTracingId;
   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) {
   int32_t kClientId1 = 111;
   uint64_t kClientTracingId1 = 11111;
   int32_t kClientId2 = 222;
   uint64_t kClientTracingId2 = 22222;
   ValueState value_state1;
   value_state1.int_value[0] = 1111;
   value_state1.int_value[1] = 0;
@@ skipping 43 matching lines @@
   const ValueState* state2 =
       pending_value_buffer_state2->GetState(GL_MOUSE_POSITION_CHROMIUM);
   EXPECT_NE(state1, state2);
 
   EXPECT_EQ(state1->int_value[0], value_state1.int_value[0]);
   EXPECT_EQ(state2->int_value[0], value_state2.int_value[0]);
   EXPECT_NE(state1->int_value[0], state2->int_value[0]);
 }
 
 }  // namespace content