Remove [Client=] annotation from ServiceProvider

services/view_manager/connection_manager.h

 // 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.
 
 #ifndef SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_
 #define SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 59 matching lines @@
   ~ConnectionManager() override;
 
   // Returns the id for the next ViewManagerServiceImpl.
   mojo::ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
   // Invoked when a ViewManagerServiceImpl's connection encounters an error.
   void OnConnectionError(ClientConnection* connection);
 
   // See description of ViewManagerService::Embed() for details. This assumes
   // |transport_view_id| is valid.
-  void EmbedAtView(
-      mojo::ConnectionSpecificId creator_id,
-      const std::string& url,
-      const ViewId& view_id,
-      mojo::InterfaceRequest<mojo::ServiceProvider> service_provider);
+  void EmbedAtView(mojo::ConnectionSpecificId creator_id,
+                   const std::string& url,
+                   const ViewId& view_id,
+                   mojo::InterfaceRequest<mojo::ServiceProvider> services,
+                   mojo::ServiceProviderPtr exposed_services);
 
   // Returns the connection by id.
   ViewManagerServiceImpl* GetConnection(
       mojo::ConnectionSpecificId connection_id);
 
   // Returns the View identified by |id|.
   ServerView* GetView(const ViewId& id);
 
   ServerView* root() { return root_.get(); }
   DisplayManager* display_manager() { return display_manager_.get(); }
@@ skipping 130 matching lines @@
   base::RepeatingTimer<ConnectionManager> animation_timer_;
 
   AnimationRunner animation_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace view_manager
 
 #endif  // SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_