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

mojo/services/public/cpp/view_manager/tests/view_manager_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 "mojo/services/public/cpp/view_manager/view_manager.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/service_manager/service_manager.h"
 #include "mojo/services/public/cpp/view_manager/lib/node_private.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
 #include "mojo/services/public/cpp/view_manager/node_observer.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
 #include "mojo/shell/shell_test_helper.h"
@@ skipping 42 matching lines @@
                               const GURL& url) OVERRIDE {
   }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       OVERRIDE {
     connection->AddService(&view_manager_client_factory_);
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
-  virtual void OnEmbed(ViewManager* view_manager, Node* root) OVERRIDE {
+  virtual void OnEmbed(ViewManager* view_manager,
+                       Node* root,
+                       ServiceProviderImpl* exported_services,
+                       scoped_ptr<ServiceProvider> imported_services) OVERRIDE {
     callback_.Run(view_manager, root);
   }
   virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE {}
 
   ScopedVector<ApplicationImpl> apps_;
   LoadedCallback callback_;
   ViewManagerClientFactory view_manager_client_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectServiceLoader);
 };
@@ skipping 234 matching lines @@
   }
 
   // Embeds another version of the test app @ node.
   ViewManager* Embed(ViewManager* view_manager, Node* node) {
     DCHECK_EQ(view_manager, NodePrivate(node).view_manager());
     node->Embed(kEmbeddedApp1URL);
     RunRunLoop();
     return GetLoadedViewManager();
   }
 
-  // TODO(beng): remove these methods once all the tests are migrated.
-  void DestroyViewManager1() {}
-  ViewManager* view_manager_1() { return NULL; }
-  ViewManager* view_manager_2() { return NULL; }
-
   ViewManager* GetLoadedViewManager() {
     ViewManager* view_manager = loaded_view_manager_;
     loaded_view_manager_ = NULL;
     return view_manager;
   }
 
   void UnloadApplication(const GURL& url) {
     test_helper_.SetLoaderForURL(scoped_ptr<ServiceLoader>(), url);
   }
 
@@ skipping 16 matching lines @@
     ASSERT_TRUE(EmbedRoot(view_manager_init_.get(), kWindowManagerURL));
   }
 
   void EmbedRootCallback(bool* result_cache, bool result) {
     *result_cache = result;
   }
 
   bool EmbedRoot(ViewManagerInitService* view_manager_init,
                  const std::string& url) {
     bool result = false;
+    ServiceProviderPtr sp;
+    BindToProxy(new ServiceProviderImpl, &sp);
     view_manager_init->Embed(
-        url,
+        url, sp.Pass(),
         base::Bind(&ViewManagerTest::EmbedRootCallback, base::Unretained(this),
                    &result));
     RunRunLoop();
     window_manager_ = GetLoadedViewManager();
     return result;
   }
 
   void OnViewManagerLoaded(ViewManager* view_manager, Node* root) {
     loaded_view_manager_ = view_manager;
     connect_loop_->Quit();
@@ skipping 285 matching lines @@
 
 // TODO(beng): tests for view event dispatcher.
 // - verify that we see events for all views.
 
 // TODO(beng): tests for focus:
 // - focus between two nodes known to a connection
 // - focus between nodes unknown to one of the connections.
 // - focus between nodes unknown to either connection.
 
 }  // namespace mojo