Mandoline UI Process: Update namespaces and file names

components/mus/surfaces/top_level_display_client.h

Index: components/mus/surfaces/top_level_display_client.h
diff --git a/components/mus/surfaces/top_level_display_client.h b/components/mus/surfaces/top_level_display_client.h
index f8e15ad63e920ad4e1ba9046821b5329c3d9858b..302ade3d4f63e89d86a5a41a5ad52637d6370d56 100644
--- a/components/mus/surfaces/top_level_display_client.h
+++ b/components/mus/surfaces/top_level_display_client.h
@@ -9,6 +9,7 @@
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
+#include "components/mus/gles2/gpu_state.h"
 #include "components/mus/surfaces/surfaces_context_provider.h"
 #include "components/mus/surfaces/surfaces_context_provider_delegate.h"
 #include "components/mus/surfaces/surfaces_state.h"
@@ -20,11 +21,7 @@ class Display;
 class SurfaceFactory;
 }
 
-namespace gles2 {
-class GpuState;
-}
-
-namespace surfaces {
+namespace mus {
 
 class DisplayDelegate;
 class SurfacesScheduler;
@@ -35,10 +32,10 @@ class SurfacesState;
 // scheduled to be generated here based on VSync.
 class TopLevelDisplayClient : public cc::DisplayClient,
                               public cc::SurfaceFactoryClient,
-                              public surfaces::SurfacesContextProviderDelegate {
+                              public SurfacesContextProviderDelegate {
  public:
   TopLevelDisplayClient(gfx::AcceleratedWidget widget,
-                        const scoped_refptr<gles2::GpuState>& gpu_state,
+                        const scoped_refptr<GpuState>& gpu_state,
                         const scoped_refptr<SurfacesState>& surfaces_state);
   ~TopLevelDisplayClient() override;
 
@@ -60,7 +57,7 @@ class TopLevelDisplayClient : public cc::DisplayClient,
   // SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
 
-  scoped_refptr<gles2::GpuState> gpu_state_;
+  scoped_refptr<GpuState> gpu_state_;
   scoped_refptr<SurfacesState> surfaces_state_;
   cc::SurfaceFactory factory_;
   cc::SurfaceId cc_id_;
@@ -73,6 +70,6 @@ class TopLevelDisplayClient : public cc::DisplayClient,
   DISALLOW_COPY_AND_ASSIGN(TopLevelDisplayClient);
 };
 
-}  // namespace surfaces
+}  // namespace mus
 
 #endif  // COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_