Changes ownership of ClientConnection

components/mus/ws/connection_manager_delegate.h

Index: components/mus/ws/connection_manager_delegate.h
diff --git a/components/mus/ws/connection_manager_delegate.h b/components/mus/ws/connection_manager_delegate.h
index 7b9c31952cb9cb30f27cfbee6ee4c732725c15c7..1cabcd1b68a55b2e0e174d0212bd15a1284f6266 100644
--- a/components/mus/ws/connection_manager_delegate.h
+++ b/components/mus/ws/connection_manager_delegate.h
@@ -9,6 +9,7 @@
 
 #include <string>
 
+#include "base/memory/scoped_ptr.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
@@ -27,6 +28,7 @@ class ClientConnection;
 class ConnectionManager;
 class ServerWindow;
 class WindowTreeHostImpl;
+class WindowTreeImpl;
 
 class ConnectionManagerDelegate {
  public:
@@ -36,20 +38,12 @@ class ConnectionManagerDelegate {
 
   // Creates a ClientConnection in response to Embed() calls on the
   // ConnectionManager.
-  virtual ClientConnection* CreateClientConnectionForEmbedAtWindow(
-      ConnectionManager* connection_manager,
+  virtual scoped_ptr<ClientConnection> CreateClientConnectionForEmbedAtWindow(
+      ws::ConnectionManager* connection_manager,
+      ws::WindowTreeImpl* tree,
       mojom::WindowTreeRequest tree_request,
-      ServerWindow* root,
-      uint32_t policy_bitmask,
       mojom::WindowTreeClientPtr client) = 0;
 
-  virtual ClientConnection* CreateClientConnectionForWindowManager(
-      WindowTreeHostImpl* tree_host,
-      ServerWindow* window,
-      const mojom::Display& display,
-      uint32_t user_id,
-      mojom::WindowManagerFactory* factory) = 0;
-
   // Called if no WindowTreeHosts have been created, but a
   // WindowManagerFactory has been set.
   virtual void CreateDefaultWindowTreeHosts() = 0;