Remove [Client=] annotation from ServiceProvider

services/window_manager/window_manager_api_unittest.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/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
@@ skipping 89 matching lines @@
   }
 
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   // Overridden from mojo::ViewManagerDelegate:
   void OnEmbed(View* root,
-               mojo::ServiceProviderImpl* exported_services,
-               scoped_ptr<mojo::ServiceProvider> imported_services) override {
+               mojo::InterfaceRequest<mojo::ServiceProvider> services,
+               mojo::ServiceProviderPtr exposed_services) override {
     root_added_callback_.Run(root);
   }
   void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override {}
 
   RootAddedCallback root_added_callback_;
 
   ScopedVector<ApplicationImpl> apps_;
   scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestApplicationLoader);
@@ skipping 37 matching lines @@
     run_loop.Run();
     return old_and_new;
   }
 
   Id OpenWindow() {
     return OpenWindowWithURL(kTestServiceURL);
   }
 
   Id OpenWindowWithURL(const std::string& url) {
     base::RunLoop run_loop;
-    mojo::ServiceProviderPtr sp;
-    BindToProxy(new mojo::ServiceProviderImpl, &sp);
-    window_manager_->Embed(
-        url, mojo::MakeRequest<mojo::ServiceProvider>(sp.PassMessagePipe()));
+    window_manager_->Embed(url, nullptr, nullptr);
     run_loop.Run();
     return WaitForEmbed();
   }
 
   TestWindowManagerClient* window_manager_client() {
     return window_manager_client_.get();
   }
 
   mojo::WindowManagerPtr window_manager_;
 
@@ skipping 78 matching lines @@
 
   Id second_window = OpenWindow();
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   ids = WaitForActiveWindowChange();
   EXPECT_EQ(ids.first, first_window);
   EXPECT_EQ(ids.second, second_window);
 }
 
 }  // namespace window_manager