Remove [Client=] annotation from ServiceProvider

services/view_manager/view_manager_service_apptest.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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
@@ skipping 11 matching lines @@
 using mojo::ERROR_CODE_NONE;
 using mojo::ErrorCode;
 using mojo::EventPtr;
 using mojo::Id;
 using mojo::InterfaceRequest;
 using mojo::ORDER_DIRECTION_ABOVE;
 using mojo::ORDER_DIRECTION_BELOW;
 using mojo::OrderDirection;
 using mojo::RectPtr;
 using mojo::ServiceProvider;
+using mojo::ServiceProviderPtr;
 using mojo::String;
 using mojo::ViewDataPtr;
 using mojo::ViewManagerClient;
 using mojo::ViewManagerService;
 
 namespace view_manager {
 
 // Creates an id used for transport from the specified parameters.
 Id BuildViewId(ConnectionSpecificId connection_id,
                ConnectionSpecificId view_id) {
@@ skipping 33 matching lines @@
   vm->CreateView(view_id,
                  base::Bind(&ErrorCodeResultCallback, &run_loop, &result));
   run_loop.Run();
   return result == ERROR_CODE_NONE;
 }
 
 bool Embed(ViewManagerService* vm, Id root_id) {
   bool result = false;
   base::RunLoop run_loop;
   {
-    mojo::ServiceProviderPtr sp;
-    vm->Embed("mojo:view_manager_service_apptests", root_id,
-              GetProxy(&sp),
+    vm->Embed("mojo:view_manager_service_apptests", root_id, nullptr, nullptr,
               base::Bind(&BoolResultCallback, &run_loop, &result));
   }
   run_loop.Run();
   return result;
 }
 
 ErrorCode CreateViewWithErrorCode(ViewManagerService* vm, Id view_id) {
   ErrorCode result = ERROR_CODE_NONE;
   base::RunLoop run_loop;
   vm->CreateView(view_id,
@@ skipping 161 matching lines @@
         wait_state_->change_count == tracker_.changes()->size()) {
       wait_state_->run_loop.Quit();
     }
   }
 
   // ViewManagerClient:
   void OnEmbed(ConnectionSpecificId connection_id,
                const String& creator_url,
                ViewDataPtr root,
                InterfaceRequest<ServiceProvider> services,
+               ServiceProviderPtr exposed_services,
                mojo::ScopedMessagePipeHandle window_manager_pipe) override {
     tracker()->OnEmbed(connection_id, creator_url, root.Pass());
     got_embed_ = true;
     if (embed_run_loop_)
       embed_run_loop_->Quit();
   }
   void OnEmbeddedAppDisconnected(Id view_id) override {
     tracker()->OnEmbeddedAppDisconnected(view_id);
   }
   void OnViewBoundsChanged(Id view_id,
@@ skipping 1135 matching lines @@
 // TODO(sky): need to better track changes to initial connection. For example,
 // that SetBounsdViews/AddView and the like don't result in messages to the
 // originating connection.
 
 // TODO(sky): make sure coverage of what was
 // ViewManagerTest.SecondEmbedRoot_InitService and
 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager
 // tests.
 
 }  // namespace view_manager