Revert of Mojo multiple command buffer support and sample

mojo/shell/context.cc

Index: mojo/shell/context.cc
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index 19e97c5a09afd57d45070f99a724e893119fbc72..a6585e2d701bed1f2cbc7d0c4f0f6879dd0a0fdc 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -11,7 +11,6 @@
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string_split.h"
 #include "build/build_config.h"
-#include "gpu/command_buffer/service/mailbox_manager.h"
 #include "mojo/application_manager/application_loader.h"
 #include "mojo/application_manager/application_manager.h"
 #include "mojo/application_manager/background_shell_application_loader.h"
@@ -19,7 +18,6 @@
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/native_viewport/gpu_impl.h"
 #include "mojo/services/native_viewport/native_viewport_impl.h"
 #include "mojo/shell/dynamic_application_loader.h"
 #include "mojo/shell/in_process_dynamic_service_runner.h"
@@ -27,7 +25,6 @@
 #include "mojo/shell/switches.h"
 #include "mojo/shell/ui_application_loader_android.h"
 #include "mojo/spy/spy.h"
-#include "ui/gl/gl_share_group.h"
 
 #if defined(OS_LINUX)
 #include "mojo/shell/dbus_application_loader_linux.h"
@@ -98,12 +95,9 @@
 class Context::NativeViewportApplicationLoader
     : public ApplicationLoader,
       public ApplicationDelegate,
-      public InterfaceFactory<NativeViewport>,
-      public InterfaceFactory<Gpu> {
+      public InterfaceFactory<NativeViewport> {
  public:
-  NativeViewportApplicationLoader()
-      : share_group_(new gfx::GLShareGroup),
-        mailbox_manager_(new gpu::gles2::MailboxManager) {}
+  NativeViewportApplicationLoader() {}
   virtual ~NativeViewportApplicationLoader() {}
 
  private:
@@ -122,8 +116,7 @@
   // ApplicationDelegate implementation.
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) OVERRIDE {
-    connection->AddService<NativeViewport>(this);
-    connection->AddService<Gpu>(this);
+    connection->AddService(this);
     return true;
   }
 
@@ -133,15 +126,6 @@
     BindToRequest(new NativeViewportImpl, &request);
   }
 
-  // InterfaceFactory<Gpu> implementation.
-  virtual void Create(ApplicationConnection* connection,
-                      InterfaceRequest<Gpu> request) OVERRIDE {
-    BindToRequest(new GpuImpl(share_group_.get(), mailbox_manager_.get()),
-                  &request);
-  }
-
-  scoped_refptr<gfx::GLShareGroup> share_group_;
-  scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   scoped_ptr<ApplicationImpl> app_;
   DISALLOW_COPY_AND_ASSIGN(NativeViewportApplicationLoader);
 };