Pass ServiceProvider thru ViewManagerService::Embed() allowing embedder & embeddee to expose servic…

mojo/services/view_manager/view_manager_init_service_impl.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 MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_SERVICE_IMPL_H_
 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_SERVICE_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 31 matching lines @@
   void OnNativeViewportDeleted();
 
   void OnRootViewManagerWindowTreeHostCreated();
 
  private:
   struct ConnectParams {
     ConnectParams();
     ~ConnectParams();
 
     std::string url;
+    InterfaceRequest<ServiceProvider> service_provider;
     Callback<void(bool)> callback;
   };
 
   void MaybeEmbed();
 
   // ViewManagerInitService overrides:
   virtual void Embed(const String& url,
+                     ServiceProviderPtr service_provider,
                      const Callback<void(bool)>& callback) OVERRIDE;
 
   ViewManagerInitServiceContext* context_;
 
   ServiceProvider* service_provider_;
 
   // Stores information about inbound calls to Embed() pending execution on
   // the window tree host being ready to use.
   ScopedVector<ConnectParams> connect_params_;
 
   bool is_tree_host_ready_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerInitServiceImpl);
 };
 
 #if defined(OS_WIN)
 #pragma warning(pop)
 #endif
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_SERVICE_IMPL_H_