Revert of Mandoline UI Process: Update namespaces and file names

components/mus/gles2/command_buffer_local.h

 // Copyright 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.
 
 #ifndef COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_
 #define COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_
 
 #include <map>
 
 #include "base/macros.h"
@@ skipping 13 matching lines @@
 namespace gles2 {
 class GLES2Decoder;
 }
 }
 
 namespace gfx {
 class GLContext;
 class GLSurface;
 }
 
-namespace mus {
+namespace gles2 {
 
 class CommandBufferLocalClient;
-class GpuState;
 
 // This class provides a thin wrapper around a CommandBufferService and a
 // GpuControl implementation to allow cc::Display to generate GL directly on
 // the same thread.
 class CommandBufferLocal : public gpu::GpuControl {
  public:
   CommandBufferLocal(CommandBufferLocalClient* client,
                      gfx::AcceleratedWidget widget,
-                     const scoped_refptr<GpuState>& gpu_state);
+                     const scoped_refptr<gles2::GpuState>& gpu_state);
   ~CommandBufferLocal() override;
 
   bool Initialize();
 
   gpu::CommandBuffer* GetCommandBuffer();
 
   // gpu::GpuControl implementation:
   gpu::Capabilities GetCapabilities() override;
   int32_t CreateImage(ClientBuffer buffer,
                       size_t width,
@@ skipping 20 matching lines @@
 
   void OnResize(gfx::Size size, float scale_factor);
   void OnUpdateVSyncParameters(const base::TimeTicks timebase,
                                const base::TimeDelta interval);
   bool OnWaitSyncPoint(uint32_t sync_point);
   void OnParseError();
   void OnContextLost(uint32_t reason);
   void OnSyncPointRetired();
 
   gfx::AcceleratedWidget widget_;
-  scoped_refptr<GpuState> gpu_state_;
+  scoped_refptr<gles2::GpuState> gpu_state_;
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::GpuScheduler> scheduler_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
   scoped_refptr<gfx::GLContext> context_;
   scoped_refptr<gfx::GLSurface> surface_;
   CommandBufferLocalClient* client_;
 
   base::WeakPtrFactory<CommandBufferLocal> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferLocal);
 };
 
-}  //  namespace mus
+}  //  namespace gles2
 
 #endif  // COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_