Shell / ShellClient -> ServiceProvider

mojo/public/cpp/application/lib/service_connector.cc

Index: mojo/public/cpp/application/lib/service_connector.cc
diff --git a/mojo/public/cpp/shell/lib/service_connector.cc b/mojo/public/cpp/application/lib/service_connector.cc
similarity index 58%
rename from mojo/public/cpp/shell/lib/service_connector.cc
rename to mojo/public/cpp/application/lib/service_connector.cc
index bdd1f3f42d1edaa0a053641c00fa943e91662494..10bda99c1a2237200fa0602d9ea93f0133ca9fc2 100644
--- a/mojo/public/cpp/shell/lib/service_connector.cc
+++ b/mojo/public/cpp/application/lib/service_connector.cc
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/public/cpp/shell/lib/service_connector.h"
+#include "mojo/public/cpp/application/lib/service_connector.h"
 
 namespace mojo {
 namespace internal {
 
-ServiceConnectorBase::Owner::Owner(ScopedMessagePipeHandle shell_handle) {
-  shell_.Bind(shell_handle.Pass());
-  shell_.set_client(this);
+ServiceConnectorBase::Owner::Owner(
+    ScopedMessagePipeHandle service_provider_handle) {
+  service_provider_.Bind(service_provider_handle.Pass());
+  service_provider_.set_client(this);
 }
 
 ServiceConnectorBase::Owner::~Owner() {}