Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/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 "mojo/aura/screen_mojo.h"
 #include "mojo/aura/window_tree_host_mojo.h"
-#include "mojo/public/cpp/application/connect.h"
-#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
+#include "mojo/public/cpp/shell/connect.h"
+#include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/services/view_manager/root_node_manager.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/window.h"
 
 namespace mojo {
 namespace view_manager {
 namespace service {
 
 class WindowTreeClientImpl : public aura::client::WindowTreeClient {
@@ skipping 18 matching lines @@
   }
 
  private:
   aura::Window* window_;
 
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImpl);
 };
 
-RootViewManager::RootViewManager(ServiceProvider* service_provider,
-                                 RootNodeManager* root_node)
-    : service_provider_(service_provider),
+RootViewManager::RootViewManager(Shell* shell, RootNodeManager* root_node)
+    : shell_(shell),
       root_node_manager_(root_node),
       in_setup_(false) {
   screen_.reset(ScreenMojo::Create());
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
   NativeViewportPtr viewport;
-  ConnectToService(service_provider,
-                   "mojo:mojo_native_viewport_service",
-                   &viewport);
+  ConnectTo(shell, "mojo:mojo_native_viewport_service", &viewport);
   window_tree_host_.reset(new WindowTreeHostMojo(
         viewport.Pass(),
         gfx::Rect(800, 600),
         base::Bind(&RootViewManager::OnCompositorCreated,
                    base::Unretained(this))));
 }
 
 RootViewManager::~RootViewManager() {
   window_tree_client_.reset();
   window_tree_host_.reset();
@@ skipping 11 matching lines @@
 
   window_tree_client_.reset(
       new WindowTreeClientImpl(window_tree_host_->window()));
 
   window_tree_host_->Show();
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo