Fix layering violation where content is included by gpu.

content/renderer/pepper/pepper_platform_context_3d_impl.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/pepper_platform_context_3d_impl.h"
 
 #include "base/bind.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/renderer/pepper/pepper_parent_context_provider.h"
@@ skipping 84 matching lines @@
         // fall-through
         default:
           attribs.push_back(attr[0]);
           attribs.push_back(attr[1]);
           break;
       }
     }
     attribs.push_back(PP_GRAPHICS3DATTRIB_NONE);
   }
 
-  CommandBufferProxy* share_buffer = NULL;
+  CommandBufferProxyImpl* share_buffer = NULL;
   if (share_context) {
     PlatformContext3DImpl* share_impl =
         static_cast<PlatformContext3DImpl*>(share_context);
     share_buffer = share_impl->command_buffer_;
   }
 
   command_buffer_ = channel_->CreateOffscreenCommandBuffer(
       surface_size,
       share_buffer,
       "*",
@@ skipping 21 matching lines @@
   parent_context_provider_ = NULL;
   parent_context_ = parent_context->AsWeakPtr();
 
   // Flush any remaining commands in the parent context to make sure the
   // texture id accounting stays consistent.
   gpu::gles2::GLES2Implementation* parent_gles2 =
       parent_context_->GetImplementation();
   parent_gles2->helper()->CommandBufferHelper::Finish();
   parent_texture_id_ = parent_gles2->MakeTextureId();
 
-  CommandBufferProxy* parent_command_buffer =
+  CommandBufferProxyImpl* parent_command_buffer =
       parent_context_->GetCommandBufferProxy();
   if (!command_buffer_->SetParent(parent_command_buffer, parent_texture_id_))
     return false;
 
   return true;
 }
 
 void PlatformContext3DImpl::SetParentContext(
     PepperParentContextProvider* parent_context_provider) {
   if (parent_context_.get() && parent_texture_id_ != 0) {
@@ skipping 13 matching lines @@
     return;
 
   parent_context_ = parent_context->AsWeakPtr();
   // Flush any remaining commands in the parent context to make sure the
   // texture id accounting stays consistent.
   gpu::gles2::GLES2Implementation* parent_gles2 =
       parent_context_->GetImplementation();
   parent_gles2->helper()->CommandBufferHelper::Flush();
   parent_texture_id_ = parent_gles2->MakeTextureId();
 
-  CommandBufferProxy* parent_command_buffer =
+  CommandBufferProxyImpl* parent_command_buffer =
       parent_context_->GetCommandBufferProxy();
   command_buffer_->SetParent(parent_command_buffer, parent_texture_id_);
 }
 
 unsigned PlatformContext3DImpl::GetBackingTextureId() {
   DCHECK(command_buffer_);
   return parent_texture_id_;
 }
 
 bool PlatformContext3DImpl::IsOpaque() {
@@ skipping 33 matching lines @@
 void PlatformContext3DImpl::OnConsoleMessage(const std::string& msg, int id) {
   DCHECK(command_buffer_);
 
   if (!console_message_callback_.is_null())
     console_message_callback_.Run(msg, id);
 }
 
 }  // namespace content
 
 #endif  // ENABLE_GPU