Revert of Mandoline UI Process: Update namespaces and file names (patchset #9 id:150001 of https://codereview.chromium.org/1340983002/ )

Reason for revert:
Speculative, might've broken mojo_apptests on http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/32066

Original issue's description:
> Mandoline UI Process: Update namespaces and file names
>
> This CL updates namespaces in components/mus to mus from mojo, surfaces, gles2, and view_manager.
>
> BUG=531533
> TBR=jam@chromium.org for trivial pdf_viewer change.
>
> Committed: https://crrev.com/49b0d73f3ebb4801fc518751145504af3a2f70ed
> Cr-Commit-Position: refs/heads/master@{#349229}

TBR=sky@chromium.org,fsamuel@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=531533

Review URL: https://codereview.chromium.org/1351013002

Cr-Commit-Position: refs/heads/master@{#349332}

11 files changed, 40 insertions, 33 deletions

diff --git a/components/mus/surfaces/surfaces_context_provider.cc b/components/mus/surfaces/surfaces_context_provider.cc
index c11fe0d..c98718a 100644
--- a/components/mus/surfaces/surfaces_context_provider.cc
+++ b/components/mus/surfaces/surfaces_context_provider.cc
@@ -16,7 +16,7 @@
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 
-namespace mus {
+namespace surfaces {
 
 namespace {
 const size_t kDefaultCommandBufferSize = 1024 * 1024;
@@ -28,10 +28,11 @@ const size_t kDefaultMaxTransferBufferSize = 16 * 1024 * 1024;
 SurfacesContextProvider::SurfacesContextProvider(
     SurfacesContextProviderDelegate* delegate,
     gfx::AcceleratedWidget widget,
-    const scoped_refptr<GpuState>& state)
+    const scoped_refptr<gles2::GpuState>& state)
     : delegate_(delegate), widget_(widget) {
   capabilities_.gpu.image = true;
-  command_buffer_local_.reset(new CommandBufferLocal(this, widget_, state));
+  command_buffer_local_.reset(
+      new gles2::CommandBufferLocal(this, widget_, state));
 }
 
 // This is called when we have an accelerated widget.
@@ -115,4 +116,4 @@ void SurfacesContextProvider::DidLoseContext() {
   lost_context_callback_.Run();
 }
 
-}  // namespace mus
+}  // namespace surfaces
diff --git a/components/mus/surfaces/surfaces_context_provider.h b/components/mus/surfaces/surfaces_context_provider.h
index 37cdfab..c8fd3eb 100644
--- a/components/mus/surfaces/surfaces_context_provider.h
+++ b/components/mus/surfaces/surfaces_context_provider.h
@@ -23,21 +23,24 @@ class GLES2Implementation;
 
 }  // 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 @@ class SurfacesContextProvider : public cc::ContextProvider,
 
   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_
diff --git a/components/mus/surfaces/surfaces_context_provider_delegate.h b/components/mus/surfaces/surfaces_context_provider_delegate.h
index 7da78d8..ff27f7d 100644
--- a/components/mus/surfaces/surfaces_context_provider_delegate.h
+++ b/components/mus/surfaces/surfaces_context_provider_delegate.h
@@ -5,7 +5,7 @@
 #ifndef COMPONENTS_MUS_SURFACES_SURFACES_CONTEXT_PROVIDER_DELEGATE_H_
 #define COMPONENTS_MUS_SURFACES_SURFACES_CONTEXT_PROVIDER_DELEGATE_H_
 
-namespace mus {
+namespace surfaces {
 
 class SurfacesContextProviderDelegate {
  public:
@@ -15,6 +15,6 @@ class SurfacesContextProviderDelegate {
   virtual ~SurfacesContextProviderDelegate() {}
 };
 
-}  // namespace mus
+}  // namespace surfaces
 
 #endif  // COMPONENTS_MUS_SURFACES_SURFACES_CONTEXT_PROVIDER_DELEGATE_H_
diff --git a/components/mus/surfaces/surfaces_output_surface.cc b/components/mus/surfaces/surfaces_output_surface.cc
index 46ccdb6..63053a4 100644
--- a/components/mus/surfaces/surfaces_output_surface.cc
+++ b/components/mus/surfaces/surfaces_output_surface.cc
@@ -11,7 +11,7 @@
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 
-namespace mus {
+namespace surfaces {
 
 DirectOutputSurface::DirectOutputSurface(
     const scoped_refptr<cc::ContextProvider>& context_provider)
@@ -37,4 +37,4 @@ void DirectOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
   client_->DidSwapBuffers();
 }
 
-}  // namespace mus
+}  // namespace surfaces
diff --git a/components/mus/surfaces/surfaces_output_surface.h b/components/mus/surfaces/surfaces_output_surface.h
index 3bd62df..ea05a50 100644
--- a/components/mus/surfaces/surfaces_output_surface.h
+++ b/components/mus/surfaces/surfaces_output_surface.h
@@ -7,7 +7,7 @@
 
 #include "cc/output/output_surface.h"
 
-namespace mus {
+namespace surfaces {
 
 // An OutputSurface implementation that directly draws and
 // swaps to an actual GL surface.
@@ -24,6 +24,6 @@ class DirectOutputSurface : public cc::OutputSurface {
   base::WeakPtrFactory<DirectOutputSurface> weak_ptr_factory_;
 };
 
-}  // namespace mus
+}  // namespace surfaces
 
 #endif  // COMPONENTS_MUS_SURFACES_SURFACES_OUTPUT_SURFACE_H_
\ No newline at end of file
diff --git a/components/mus/surfaces/surfaces_scheduler.cc b/components/mus/surfaces/surfaces_scheduler.cc
index f3752f8..a938f33 100644
--- a/components/mus/surfaces/surfaces_scheduler.cc
+++ b/components/mus/surfaces/surfaces_scheduler.cc
@@ -8,7 +8,7 @@
 #include "cc/scheduler/compositor_timing_history.h"
 #include "cc/surfaces/display.h"
 
-namespace mus {
+namespace surfaces {
 
 SurfacesScheduler::SurfacesScheduler()
     : rendering_stats_instrumentation_(
@@ -98,4 +98,4 @@ void SurfacesScheduler::SendBeginFramesToChildren(
 
 void SurfacesScheduler::SendBeginMainFrameNotExpectedSoon() {}
 
-}  // namespace mus
+}  // namespace mojo
diff --git a/components/mus/surfaces/surfaces_scheduler.h b/components/mus/surfaces/surfaces_scheduler.h
index bffd9dd..86f05c3 100644
--- a/components/mus/surfaces/surfaces_scheduler.h
+++ b/components/mus/surfaces/surfaces_scheduler.h
@@ -14,7 +14,7 @@ class Display;
 class RenderingStatsInstrumentation;
 }
 
-namespace mus {
+namespace surfaces {
 
 // TODO(brianderson): Reconcile with DisplayScheduler crbug.com/476676
 class SurfacesScheduler : public cc::SchedulerClient {
@@ -53,6 +53,6 @@ class SurfacesScheduler : public cc::SchedulerClient {
   DISALLOW_COPY_AND_ASSIGN(SurfacesScheduler);
 };
 
-}  // namespace mus
+}  // namespace surfaces
 
 #endif  // COMPONENTS_MUS_SURFACES_SURFACES_SCHEDULER_H_
diff --git a/components/mus/surfaces/surfaces_state.cc b/components/mus/surfaces/surfaces_state.cc
index e3dfeb8..6ae5118 100644
--- a/components/mus/surfaces/surfaces_state.cc
+++ b/components/mus/surfaces/surfaces_state.cc
@@ -4,10 +4,10 @@
 
 #include "components/mus/surfaces/surfaces_state.h"
 
-namespace mus {
+namespace surfaces {
 
 SurfacesState::SurfacesState() : next_id_namespace_(1u) {}
 
 SurfacesState::~SurfacesState() {}
 
-}  // namespace mus
+}  // namespace surfaces
diff --git a/components/mus/surfaces/surfaces_state.h b/components/mus/surfaces/surfaces_state.h
index 5d31930..b4d4a2e 100644
--- a/components/mus/surfaces/surfaces_state.h
+++ b/components/mus/surfaces/surfaces_state.h
@@ -14,7 +14,7 @@ namespace cc {
 class SurfaceManager;
 }  // namespace cc
 
-namespace mus {
+namespace surfaces {
 
 // The SurfacesState object is an object global to the View Manager app that
 // holds the SurfaceManager, SurfacesScheduler and allocates new Surfaces
@@ -45,6 +45,6 @@ class SurfacesState : public base::RefCounted<SurfacesState> {
   DISALLOW_COPY_AND_ASSIGN(SurfacesState);
 };
 
-}  // namespace mus
+}  // namespace surfaces
 
 #endif  //  COMPONENTS_MUS_SURFACES_SURFACES_STATE_H_
diff --git a/components/mus/surfaces/top_level_display_client.cc b/components/mus/surfaces/top_level_display_client.cc
index 5f225f9..e3218af 100644
--- a/components/mus/surfaces/top_level_display_client.cc
+++ b/components/mus/surfaces/top_level_display_client.cc
@@ -12,7 +12,7 @@
 #include "components/mus/surfaces/surfaces_scheduler.h"
 #include "components/mus/surfaces/surfaces_state.h"
 
-namespace mus {
+namespace surfaces {
 namespace {
 void CallCallback(const base::Closure& callback, cc::SurfaceDrawStatus status) {
   callback.Run();
@@ -21,7 +21,7 @@ void CallCallback(const base::Closure& callback, cc::SurfaceDrawStatus status) {
 
 TopLevelDisplayClient::TopLevelDisplayClient(
     gfx::AcceleratedWidget widget,
-    const scoped_refptr<GpuState>& gpu_state,
+    const scoped_refptr<gles2::GpuState>& gpu_state,
     const scoped_refptr<SurfacesState>& surfaces_state)
     : surfaces_state_(surfaces_state),
       factory_(surfaces_state->manager(), this),
@@ -35,7 +35,7 @@ TopLevelDisplayClient::TopLevelDisplayClient(
   // TODO(brianderson): Reconcile with SurfacesScheduler crbug.com/476676
   cc::DisplayScheduler* null_display_scheduler = nullptr;
   display_->Initialize(
-      make_scoped_ptr(new DirectOutputSurface(
+      make_scoped_ptr(new surfaces::DirectOutputSurface(
           new SurfacesContextProvider(this, widget, gpu_state))),
       null_display_scheduler);
 
@@ -101,4 +101,4 @@ void TopLevelDisplayClient::ReturnResources(
   // TODO(fsamuel): Implement this.
 }
 
-}  // namespace mus
+}  // namespace surfaces
diff --git a/components/mus/surfaces/top_level_display_client.h b/components/mus/surfaces/top_level_display_client.h
index 3122c44..5179589 100644
--- a/components/mus/surfaces/top_level_display_client.h
+++ b/components/mus/surfaces/top_level_display_client.h
@@ -9,7 +9,6 @@
 #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"
@@ -21,7 +20,11 @@ class Display;
 class SurfaceFactory;
 }
 
-namespace mus {
+namespace gles2 {
+class GpuState;
+}
+
+namespace surfaces {
 
 class DisplayDelegate;
 class SurfacesScheduler;
@@ -32,10 +35,10 @@ class SurfacesState;
 // scheduled to be generated here based on VSync.
 class TopLevelDisplayClient : public cc::DisplayClient,
                               public cc::SurfaceFactoryClient,
-                              public SurfacesContextProviderDelegate {
+                              public surfaces::SurfacesContextProviderDelegate {
  public:
   TopLevelDisplayClient(gfx::AcceleratedWidget widget,
-                        const scoped_refptr<GpuState>& gpu_state,
+                        const scoped_refptr<gles2::GpuState>& gpu_state,
                         const scoped_refptr<SurfacesState>& surfaces_state);
   ~TopLevelDisplayClient() override;
 
@@ -68,6 +71,6 @@ class TopLevelDisplayClient : public cc::DisplayClient,
   DISALLOW_COPY_AND_ASSIGN(TopLevelDisplayClient);
 };
 
-}  // namespace mus
+}  // namespace surfaces
 
 #endif  // COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_