Changes ownership of ClientConnection

components/mus/mus_app.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 COMPONENTS_MUS_MUS_APP_H_
 #define COMPONENTS_MUS_MUS_APP_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 52 matching lines @@
   void InitializeResources(mojo::Connector* connector);
 
   // mojo::ShellClient:
   void Initialize(mojo::Connector* connector, const std::string& url,
                   uint32_t id, uint32_t user_id) override;
   bool AcceptConnection(mojo::Connection* connection) override;
 
   // ConnectionManagerDelegate:
   void OnFirstRootConnectionCreated() override;
   void OnNoMoreRootConnections() override;
-  ws::ClientConnection* CreateClientConnectionForEmbedAtWindow(
+  scoped_ptr<ws::ClientConnection> CreateClientConnectionForEmbedAtWindow(
       ws::ConnectionManager* connection_manager,
+      ws::WindowTreeImpl* tree,
       mojom::WindowTreeRequest tree_request,
-      ws::ServerWindow* root,
-      uint32_t policy_bitmask,
       mojom::WindowTreeClientPtr client) override;
-  ws::ClientConnection* CreateClientConnectionForWindowManager(
-      ws::WindowTreeHostImpl* tree_host,
-      ws::ServerWindow* root,
-      const mojom::Display& display,
-      uint32_t user_id,
-      mojom::WindowManagerFactory* factory) override;
   void CreateDefaultWindowTreeHosts() override;
 
   // mojo::InterfaceFactory<mojom::DisplayManager> implementation.
   void Create(mojo::Connection* connection,
               mojom::DisplayManagerRequest request) override;
 
   // mojo::InterfaceFactory<mojom::WindowManagerFactoryService> implementation.
   void Create(mojo::Connection* connection,
               mojom::WindowManagerFactoryServiceRequest request) override;
 
@@ skipping 24 matching lines @@
 
   // Surfaces
   scoped_refptr<SurfacesState> surfaces_state_;
 
   DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_MUS_APP_H_