Revert of Mojo multiple command buffer support and sample

mojo/services/view_manager/root_view_manager.cc

 // Copyright 2014 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 "mojo/services/view_manager/root_view_manager.h"
 
 #include "base/auto_reset.h"
 #include "base/scoped_observer.h"
 #include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
 #include "mojo/services/view_manager/root_node_manager.h"
 #include "mojo/services/view_manager/root_view_manager_delegate.h"
 #include "mojo/services/view_manager/screen_impl.h"
 #include "mojo/services/view_manager/window_tree_host_impl.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 
@@ skipping 54 matching lines @@
     RootViewManagerDelegate* delegate,
     const Callback<void()>& native_viewport_closed_callback)
     : delegate_(delegate),
       root_node_manager_(root_node),
       in_setup_(false) {
   screen_.reset(ScreenImpl::Create());
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
   NativeViewportPtr viewport;
   app_connection->ConnectToService(
       "mojo:mojo_native_viewport_service", &viewport);
-  GpuPtr gpu_service;
-  // TODO(jamesr): Should be mojo:mojo_gpu_service
-  app_connection->ConnectToService("mojo:mojo_native_viewport_service",
-                                   &gpu_service);
   window_tree_host_.reset(new WindowTreeHostImpl(
-      viewport.Pass(),
-      gpu_service.Pass(),
-      gfx::Rect(800, 600),
-      base::Bind(&RootViewManager::OnCompositorCreated, base::Unretained(this)),
-      native_viewport_closed_callback,
-      base::Bind(&RootNodeManager::DispatchNodeInputEventToWindowManager,
-                 base::Unretained(root_node_manager_))));
+        viewport.Pass(),
+        gfx::Rect(800, 600),
+        base::Bind(&RootViewManager::OnCompositorCreated,
+                   base::Unretained(this)),
+        native_viewport_closed_callback,
+        base::Bind(&RootNodeManager::DispatchNodeInputEventToWindowManager,
+                   base::Unretained(root_node_manager_))));
 }
 
 RootViewManager::~RootViewManager() {
   window_tree_client_.reset();
   window_tree_host_.reset();
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);
 }
 
 void RootViewManager::OnCompositorCreated() {
   base::AutoReset<bool> resetter(&in_setup_, true);
@@ skipping 11 matching lines @@
   aura::client::SetFocusClient(window_tree_host_->window(),
                                focus_client_.get());
 
   window_tree_host_->Show();
 
   delegate_->OnRootViewManagerWindowTreeHostCreated();
 }
 
 }  // namespace service
 }  // namespace mojo