Revert of Mandoline UI Process: Update namespaces and file names

components/mus/surfaces/top_level_display_client.cc

 // 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.
 
 #include "components/mus/surfaces/top_level_display_client.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/display.h"
 #include "components/mus/gles2/gpu_state.h"
 #include "components/mus/surfaces/surfaces_context_provider.h"
 #include "components/mus/surfaces/surfaces_output_surface.h"
 #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();
 }
 }
 
 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),
       cc_id_(static_cast<uint64_t>(surfaces_state->next_id_namespace()) << 32) {
   factory_.Create(cc_id_);
 
   display_.reset(new cc::Display(this, surfaces_state_->manager(), nullptr,
                                  nullptr, cc::RendererSettings()));
   surfaces_state_->scheduler()->AddDisplay(display_.get());
 
   // 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);
 
   display_->Resize(last_submitted_frame_size_);
 
   // TODO(fsamuel): Plumb the proper device scale factor.
   display_->SetSurfaceId(cc_id_, 1.f /* device_scale_factor */);
 }
 
 TopLevelDisplayClient::~TopLevelDisplayClient() {
@@ skipping 45 matching lines @@
   surfaces_state_->scheduler()->OnVSyncParametersUpdated(
       base::TimeTicks::FromInternalValue(timebase),
       base::TimeDelta::FromInternalValue(interval));
 }
 
 void TopLevelDisplayClient::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   // TODO(fsamuel): Implement this.
 }
 
-}  // namespace mus
+}  // namespace surfaces