Moves mandoline/ui/aura to ui/views/mus

ui/views/mus/surface_context_factory.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 MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_
-#define MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_
+#ifndef UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_
+#define UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_
 
 #include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h"
 #include "components/mus/gles2/raster_thread_helper.h"
-#include "mandoline/ui/aura/surface_binding.h"
 #include "ui/compositor/compositor.h"
+#include "ui/views/mus/surface_binding.h"
 
 namespace mojo {
 class Shell;
 }
 
 namespace mus {
 class View;
 }
 
-namespace mandoline {
+namespace views {
 
 class SurfaceContextFactory : public ui::ContextFactory {
  public:
   SurfaceContextFactory(mojo::Shell* shell, mus::View* view);
   ~SurfaceContextFactory() override;
 
  private:
   // ContextFactory:
   void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override;
   scoped_ptr<ui::Reflector> CreateReflector(
@@ skipping 13 matching lines @@
                      const gfx::Size& size) override;
 
   SurfaceBinding surface_binding_;
   uint32_t next_surface_id_namespace_;
   gles2::RasterThreadHelper raster_thread_helper_;
   mus::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceContextFactory);
 };
 
-}  // namespace mandoline
+}  // namespace views
 
-#endif  // MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_
+#endif  // UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_