Shell / ShellClient -> ServiceProvider

mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.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/public/cpp/view_manager/lib/view_manager_synchronizer.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
-#include "mojo/public/cpp/shell/connect.h"
-#include "mojo/public/interfaces/shell/shell.mojom.h"
+#include "mojo/public/cpp/application/connect.h"
+#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace mojo {
 namespace view_manager {
 
@@ skipping 383 matching lines @@
 };
 
 ViewManagerSynchronizer::ViewManagerSynchronizer(ViewManager* view_manager)
     : view_manager_(view_manager),
       connected_(false),
       connection_id_(0),
       next_id_(1),
       next_server_change_id_(0),
       sync_factory_(this),
       init_loop_(NULL) {
-  ConnectTo(ViewManagerPrivate(view_manager_).shell(), "mojo:mojo_view_manager",
-            &service_);
+  ConnectToService(
+      ViewManagerPrivate(view_manager_).service_provider(),
+      "mojo:mojo_view_manager",
+      &service_);
   service_.set_client(this);
 
   // Start a runloop. This loop is quit when the server tells us about the
   // connection (OnConnectionEstablished()).
   base::RunLoop loop;
   init_loop_ = &loop;
   init_loop_->Run();
   init_loop_ = NULL;
 }
 
@@ skipping 191 matching lines @@
 void ViewManagerSynchronizer::RemoveFromPendingQueue(
     ViewManagerTransaction* transaction) {
   DCHECK_EQ(transaction, pending_transactions_.front());
   pending_transactions_.erase(pending_transactions_.begin());
   if (pending_transactions_.empty() && !changes_acked_callback_.is_null())
     changes_acked_callback_.Run();
 }
 
 }  // namespace view_manager
 }  // namespace mojo