| Index: components/mus/gles2/command_buffer_local.cc | 
| diff --git a/components/view_manager/gles2/command_buffer_local.cc b/components/mus/gles2/command_buffer_local.cc | 
| similarity index 90% | 
| rename from components/view_manager/gles2/command_buffer_local.cc | 
| rename to components/mus/gles2/command_buffer_local.cc | 
| index d44a20efcf9d714cdfa8cc7dadf8c10bd57a0eea..3d2ac952b8f3462c02ad99063885ee178a176700 100644 | 
| --- a/components/view_manager/gles2/command_buffer_local.cc | 
| +++ b/components/mus/gles2/command_buffer_local.cc | 
| @@ -2,12 +2,12 @@ | 
| // Use of this source code is governed by a BSD-style license that can be | 
| // found in the LICENSE file. | 
|  | 
| -#include "components/view_manager/gles2/command_buffer_local.h" | 
| +#include "components/mus/gles2/command_buffer_local.h" | 
|  | 
| #include "base/bind.h" | 
| -#include "components/view_manager/gles2/command_buffer_local_client.h" | 
| -#include "components/view_manager/gles2/gpu_memory_tracker.h" | 
| -#include "components/view_manager/gles2/mojo_gpu_memory_buffer.h" | 
| +#include "components/mus/gles2/command_buffer_local_client.h" | 
| +#include "components/mus/gles2/gpu_memory_tracker.h" | 
| +#include "components/mus/gles2/mojo_gpu_memory_buffer.h" | 
| #include "gpu/command_buffer/service/command_buffer_service.h" | 
| #include "gpu/command_buffer/service/context_group.h" | 
| #include "gpu/command_buffer/service/gpu_scheduler.h" | 
| @@ -33,8 +33,7 @@ CommandBufferLocal::CommandBufferLocal( | 
| : widget_(widget), | 
| gpu_state_(gpu_state), | 
| client_(client), | 
| -      weak_factory_(this) { | 
| -} | 
| +      weak_factory_(this) {} | 
|  | 
| CommandBufferLocal::~CommandBufferLocal() { | 
| command_buffer_.reset(); | 
| @@ -92,8 +91,8 @@ bool CommandBufferLocal::Initialize() { | 
| decoder_->set_engine(scheduler_.get()); | 
| decoder_->SetResizeCallback( | 
| base::Bind(&CommandBufferLocal::OnResize, base::Unretained(this))); | 
| -  decoder_->SetWaitSyncPointCallback(base::Bind( | 
| -      &CommandBufferLocal::OnWaitSyncPoint, base::Unretained(this))); | 
| +  decoder_->SetWaitSyncPointCallback( | 
| +      base::Bind(&CommandBufferLocal::OnWaitSyncPoint, base::Unretained(this))); | 
|  | 
| gpu::gles2::DisallowedFeatures disallowed_features; | 
|  | 
| @@ -104,8 +103,8 @@ bool CommandBufferLocal::Initialize() { | 
| attrib_vector)) | 
| return false; | 
|  | 
| -  command_buffer_->SetPutOffsetChangeCallback(base::Bind( | 
| -      &CommandBufferLocal::PumpCommands, base::Unretained(this))); | 
| +  command_buffer_->SetPutOffsetChangeCallback( | 
| +      base::Bind(&CommandBufferLocal::PumpCommands, base::Unretained(this))); | 
| command_buffer_->SetGetBufferChangeCallback(base::Bind( | 
| &gpu::GpuScheduler::SetGetBuffer, base::Unretained(scheduler_.get()))); | 
| command_buffer_->SetParseErrorCallback( | 
| @@ -156,11 +155,10 @@ void CommandBufferLocal::DestroyImage(int32 id) { | 
| image_manager->RemoveImage(id); | 
| } | 
|  | 
| -int32_t CommandBufferLocal::CreateGpuMemoryBufferImage( | 
| -    size_t width, | 
| -    size_t height, | 
| -    unsigned internalformat, | 
| -    unsigned usage) { | 
| +int32_t CommandBufferLocal::CreateGpuMemoryBufferImage(size_t width, | 
| +                                                       size_t height, | 
| +                                                       unsigned internalformat, | 
| +                                                       unsigned usage) { | 
| DCHECK_EQ(usage, static_cast<unsigned>(GL_MAP_CHROMIUM)); | 
| scoped_ptr<gfx::GpuMemoryBuffer> buffer( | 
| gles2::MojoGpuMemoryBufferImpl::Create( | 
| @@ -186,8 +184,7 @@ void CommandBufferLocal::RetireSyncPoint(uint32_t sync_point) { | 
| } | 
|  | 
| void CommandBufferLocal::SignalSyncPoint(uint32_t sync_point, | 
| -                                              const base::Closure& callback) { | 
| -} | 
| +                                         const base::Closure& callback) {} | 
|  | 
| void CommandBufferLocal::SignalQuery(uint32_t query, | 
| const base::Closure& callback) { | 
| @@ -234,7 +231,6 @@ void CommandBufferLocal::OnUpdateVSyncParameters( | 
| if (client_) | 
| client_->UpdateVSyncParameters(timebase.ToInternalValue(), | 
| interval.ToInternalValue()); | 
| - | 
| } | 
|  | 
| bool CommandBufferLocal::OnWaitSyncPoint(uint32_t sync_point) { | 
|  |