Remove [Client=] annotation from ServiceProvider

services/view_manager/connection_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 "services/view_manager/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
@@ skipping 146 matching lines @@
   for (auto& pair : connection_map_) {
     pair.second->service()->OnWillDestroyViewManagerServiceImpl(
         connection->service());
   }
 }
 
 void ConnectionManager::EmbedAtView(
     ConnectionSpecificId creator_id,
     const std::string& url,
     const ViewId& view_id,
-    mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) {
+    mojo::InterfaceRequest<mojo::ServiceProvider> services,
+    mojo::ServiceProviderPtr exposed_services) {
   std::string creator_url;
   ConnectionMap::const_iterator it = connection_map_.find(creator_id);
   if (it != connection_map_.end())
     creator_url = it->second->service()->url();
 
   ClientConnection* client_connection =
       delegate_->CreateClientConnectionForEmbedAtView(
           this, creator_id, creator_url, url, view_id);
   AddConnection(client_connection);
   client_connection->service()->Init(client_connection->client(),
-                                     service_provider.Pass());
+                                     services.Pass(), exposed_services.Pass());
   OnConnectionMessagedClient(client_connection->service()->id());
 }
 
 ViewManagerServiceImpl* ConnectionManager::GetConnection(
     ConnectionSpecificId connection_id) {
   ConnectionMap::iterator i = connection_map_.find(connection_id);
   return i == connection_map_.end() ? nullptr : i->second->service();
 }
 
 ServerView* ConnectionManager::GetView(const ViewId& id) {
@@ skipping 20 matching lines @@
       return pair.second->service();
   }
   return nullptr;
 }
 
 void ConnectionManager::SetWindowManagerClientConnection(
     scoped_ptr<ClientConnection> connection) {
   CHECK(!window_manager_client_connection_);
   window_manager_client_connection_ = connection.release();
   AddConnection(window_manager_client_connection_);
-  mojo::ServiceProviderPtr sp;
   window_manager_client_connection_->service()->Init(
-      window_manager_client_connection_->client(),
-      GetProxy(&sp));
+      window_manager_client_connection_->client(), nullptr, nullptr);
 }
 
 bool ConnectionManager::CloneAndAnimate(const ViewId& view_id) {
   ServerView* view = GetView(view_id);
   if (!view || !view->IsDrawn(root_.get()) || view == root_.get())
     return false;
   if (!animation_timer_.IsRunning()) {
     animation_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(100),
                            this, &ConnectionManager::DoAnimation);
   }
@@ skipping 217 matching lines @@
 void ConnectionManager::SetViewportSize(mojo::SizePtr size) {
   gfx::Size new_size = size.To<gfx::Size>();
   display_manager_->SetViewportSize(new_size);
 }
 
 void ConnectionManager::CloneAndAnimate(mojo::Id transport_view_id) {
   CloneAndAnimate(ViewIdFromTransportId(transport_view_id));
 }
 
 }  // namespace view_manager