Changes ownership of ClientConnection

components/mus/ws/window_tree_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 <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 200 matching lines @@
   bool record_on_change_completed_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClient);
 };
 
 // -----------------------------------------------------------------------------
 
 // ClientConnection implementation that vends TestWindowTreeClient.
 class TestClientConnection : public ClientConnection {
  public:
-  explicit TestClientConnection(scoped_ptr<WindowTreeImpl> service_impl)
-      : ClientConnection(std::move(service_impl), &client_),
-        is_paused_(false) {}
+  TestClientConnection() : ClientConnection(&client_), is_paused_(false) {}
+  ~TestClientConnection() override {}
 
   TestWindowTreeClient* client() { return &client_; }
 
   bool is_paused() const { return is_paused_; }
 
   // ClientConnection:
   mojom::WindowManager* GetWindowManager() override {
     NOTREACHED();
     return nullptr;
   }
   void SetIncomingMethodCallProcessingPaused(bool paused) override {
     is_paused_ = paused;
   }
 
  private:
-  ~TestClientConnection() override {}
-
   TestWindowTreeClient client_;
   bool is_paused_;
 
   DISALLOW_COPY_AND_ASSIGN(TestClientConnection);
 };
 
 // -----------------------------------------------------------------------------
 
 // Empty implementation of ConnectionManagerDelegate.
 class TestConnectionManagerDelegate : public ConnectionManagerDelegate {
  public:
   TestConnectionManagerDelegate() : last_connection_(nullptr) {}
   ~TestConnectionManagerDelegate() override {}
 
   TestWindowTreeClient* last_client() {
     return last_connection_ ? last_connection_->client() : nullptr;
   }
 
   TestClientConnection* last_connection() { return last_connection_; }
 
  private:
   // ConnectionManagerDelegate:
   void OnNoMoreRootConnections() override {}
-  ClientConnection* CreateClientConnectionForEmbedAtWindow(
-      ConnectionManager* connection_manager,
-      mojo::InterfaceRequest<mus::mojom::WindowTree> service_request,
-      ServerWindow* root,
-      uint32_t policy_bitmask,
-      mus::mojom::WindowTreeClientPtr client) override {
-    scoped_ptr<WindowTreeImpl> service(
-        new WindowTreeImpl(connection_manager, root, policy_bitmask));
-    last_connection_ = new TestClientConnection(std::move(service));
-    return last_connection_;
-  }
-  ClientConnection* CreateClientConnectionForWindowManager(
-      WindowTreeHostImpl* tree_host,
-      ServerWindow* window,
-      const mojom::Display& display,
-      uint32_t user_id,
-      mojom::WindowManagerFactory* factory) override {
-    NOTREACHED();
-    return nullptr;
+  scoped_ptr<ClientConnection> CreateClientConnectionForEmbedAtWindow(
+      ws::ConnectionManager* connection_manager,
+      ws::WindowTreeImpl* tree,
+      mojom::WindowTreeRequest tree_request,
+      mojom::WindowTreeClientPtr client) override {
+    scoped_ptr<TestClientConnection> connection(new TestClientConnection);
+    last_connection_ = connection.get();
+    return std::move(connection);
   }
   void CreateDefaultWindowTreeHosts() override { NOTREACHED(); }
 
   TestClientConnection* last_connection_;
   WindowTreeHostImpl* window_tree_host_;
 
   DISALLOW_COPY_AND_ASSIGN(TestConnectionManagerDelegate);
 };
 
 // -----------------------------------------------------------------------------
@@ skipping 655 matching lines @@
   mojom_window_tree->ReleaseCapture(++change_id,
                                     WindowIdToTransportId(root_window->id()));
   EXPECT_EQ(window, host->GetCaptureWindow());
   mojom_window_tree->ReleaseCapture(++change_id,
                                     WindowIdToTransportId(window->id()));
   EXPECT_EQ(nullptr, host->GetCaptureWindow());
 }
 
 }  // namespace ws
 }  // namespace mus