Revert of Mandoline UI Process: Update namespaces and file names

components/mus/surfaces/surfaces_context_provider.h

Index: components/mus/surfaces/surfaces_context_provider.h
diff --git a/components/mus/surfaces/surfaces_context_provider.h b/components/mus/surfaces/surfaces_context_provider.h
index 37cdfab770587cd3af6cbd438d669c087472794c..c8fd3eb1a2c386eef1365d003f6b62aea598afde 100644
--- a/components/mus/surfaces/surfaces_context_provider.h
+++ b/components/mus/surfaces/surfaces_context_provider.h
@@ -23,21 +23,24 @@
 
 }  // namespace gpu
 
-namespace mus {
-
+namespace gles2 {
 class CommandBufferDriver;
 class CommandBufferImpl;
 class CommandBufferLocal;
 class GpuState;
+}
+
+namespace surfaces {
+
 class SurfacesContextProviderDelegate;
 
 class SurfacesContextProvider : public cc::ContextProvider,
-                                public CommandBufferLocalClient,
+                                public gles2::CommandBufferLocalClient,
                                 public base::NonThreadSafe {
  public:
   SurfacesContextProvider(SurfacesContextProviderDelegate* delegate,
                           gfx::AcceleratedWidget widget,
-                          const scoped_refptr<GpuState>& state);
+                          const scoped_refptr<gles2::GpuState>& state);
 
   // cc::ContextProvider implementation.
   bool BindToCurrentThread() override;
@@ -77,13 +80,13 @@
 
   SurfacesContextProviderDelegate* delegate_;
   gfx::AcceleratedWidget widget_;
-  scoped_ptr<CommandBufferLocal> command_buffer_local_;
+  scoped_ptr<gles2::CommandBufferLocal> command_buffer_local_;
 
   base::Lock context_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfacesContextProvider);
 };
 
-}  // namespace mus
+}  // namespace surfaces
 
 #endif  // COMPONENTS_MUS_SURFACES_SURFACES_CONTEXT_PROVIDER_H_