Make Mozart view manager use the new compositor.

services/ui/view_manager/view_manager_impl.cc

Index: services/ui/view_manager/view_manager_impl.cc
diff --git a/services/ui/view_manager/view_manager_impl.cc b/services/ui/view_manager/view_manager_impl.cc
index 38cf975eac27a83b86d8a34989a24e2a72fbac0f..fa668689b46fbc2f304e04554c4b1f7239bbfadb 100644
--- a/services/ui/view_manager/view_manager_impl.cc
+++ b/services/ui/view_manager/view_manager_impl.cc
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "services/ui/view_manager/view_host_impl.h"
 #include "services/ui/view_manager/view_manager_impl.h"
+
+#include "services/ui/view_manager/view_host_impl.h"
 #include "services/ui/view_manager/view_tree_host_impl.h"
 
 namespace view_manager {
@@ -16,18 +17,21 @@ ViewManagerImpl::~ViewManagerImpl() {}
 void ViewManagerImpl::RegisterView(
     mojo::ui::ViewPtr view,
     mojo::InterfaceRequest<mojo::ui::ViewHost> view_host_request,
+    const mojo::String& label,
     const RegisterViewCallback& callback) {
   mojo::ui::ViewTokenPtr view_token =
-      registry_->RegisterView(view.Pass(), view_host_request.Pass());
+      registry_->RegisterView(view.Pass(), view_host_request.Pass(), label);
   callback.Run(view_token.Pass());
 }
 
 void ViewManagerImpl::RegisterViewTree(
     mojo::ui::ViewTreePtr view_tree,
     mojo::InterfaceRequest<mojo::ui::ViewTreeHost> view_tree_host_request,
+    const mojo::String& label,
     const RegisterViewTreeCallback& callback) {
-  registry_->RegisterViewTree(view_tree.Pass(), view_tree_host_request.Pass());
-  callback.Run();
+  mojo::ui::ViewTreeTokenPtr view_tree_token = registry_->RegisterViewTree(
+      view_tree.Pass(), view_tree_host_request.Pass(), label);
+  callback.Run(view_tree_token.Pass());
 }
 
 }  // namespace view_manager