Revert of Mandoline UI Process: Update namespaces and file names

components/html_viewer/global_state.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 COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_
 #define COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
@@ skipping 56 matching lines @@
   float device_pixel_ratio() const { return device_pixel_ratio_; }
 
   scoped_refptr<base::SingleThreadTaskRunner> compositor_thread() {
     return compositor_thread_.task_runner();
   }
 
   gles2::RasterThreadHelper* raster_thread_helper() {
     return &raster_thread_helper_;
   }
 
-  mus::MojoGpuMemoryBufferManager* gpu_memory_buffer_manager() {
+  gles2::MojoGpuMemoryBufferManager* gpu_memory_buffer_manager() {
     return &gpu_memory_buffer_manager_;
   }
 
   MediaFactory* media_factory() { return media_factory_.get(); }
 
  private:
   // App for HTMLViewer, not the document's app.
   // WARNING: do not expose this. It's too easy to use the wrong one.
   // HTMLDocument should be using the application it creates, not this one.
   mojo::ApplicationImpl* app_;
@@ skipping 14 matching lines @@
   // oldest unlocked chunks on allocation.
   //
   // TODO(erg): In the long run, delete this allocator and get the real shared
   // memory based purging allocator working here.
   DiscardableMemoryAllocator discardable_memory_allocator_;
 
   scoped_ptr<scheduler::RendererScheduler> renderer_scheduler_;
   scoped_ptr<BlinkPlatformImpl> blink_platform_;
   base::Thread compositor_thread_;
   gles2::RasterThreadHelper raster_thread_helper_;
-  mus::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
+  gles2::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
   scoped_ptr<MediaFactory> media_factory_;
 
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
   skia::RefPtr<font_service::FontLoader> font_loader_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(GlobalState);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_