Change Shell / ShellClient to ServiceProvider

mojo/shell/view_manager_loader.cc

Index: mojo/shell/view_manager_loader.cc
diff --git a/mojo/shell/view_manager_loader.cc b/mojo/shell/view_manager_loader.cc
index c590dd7679db8a39d3c44b0ee2415a3eb475e85c..3b4adcf9770046f6ece35b0feb2f04fcd01967f8 100644
--- a/mojo/shell/view_manager_loader.cc
+++ b/mojo/shell/view_manager_loader.cc
@@ -4,7 +4,7 @@
 
 #include "mojo/shell/view_manager_loader.h"
 
-#include "mojo/public/cpp/shell/application.h"
+#include "mojo/public/cpp/application/application.h"
 #include "mojo/services/view_manager/root_node_manager.h"
 #include "mojo/services/view_manager/view_manager_connection.h"
 
@@ -17,13 +17,14 @@ ViewManagerLoader::ViewManagerLoader() {
 ViewManagerLoader::~ViewManagerLoader() {
 }
 
-void ViewManagerLoader::LoadService(ServiceManager* manager,
-                                    const GURL& url,
-                                    ScopedMessagePipeHandle shell_handle) {
-  scoped_ptr<Application> app(new Application(shell_handle.Pass()));
+void ViewManagerLoader::LoadService(
+    ServiceManager* manager,
+    const GURL& url,
+    ScopedMessagePipeHandle service_provider_handle) {
+  scoped_ptr<Application> app(new Application(service_provider_handle.Pass()));
   if (!root_node_manager_.get()) {
     root_node_manager_.reset(
-        new view_manager::service::RootNodeManager(app->shell()));
+        new view_manager::service::RootNodeManager(app->service_provider()));
   }
   app->AddService<view_manager::service::ViewManagerConnection>(
       root_node_manager_.get());