views/mus: Have explicit ownership of views::WindowManagerConnection.

ui/views/mus/views_mus_test_suite.cc

 // Copyright 2016 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 "ui/views/mus/views_mus_test_suite.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 28 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultShellClient);
 };
 
 class PlatformTestHelperMus : public PlatformTestHelper {
  public:
   PlatformTestHelperMus(shell::Connector* connector,
                         const shell::Identity& identity) {
     // It is necessary to recreate the WindowManagerConnection for each test,
     // since a new MessageLoop is created for each test.
-    WindowManagerConnection::Create(connector, identity);
+    connection_ = WindowManagerConnection::Create(connector, identity);
   }
-  ~PlatformTestHelperMus() override { WindowManagerConnection::Reset(); }
+  ~PlatformTestHelperMus() override {}
 
  private:
+  std::unique_ptr<WindowManagerConnection> connection_;
+
   DISALLOW_COPY_AND_ASSIGN(PlatformTestHelperMus);
 };
 
 std::unique_ptr<PlatformTestHelper> CreatePlatformTestHelper(
     const shell::Identity& identity,
     const base::Callback<shell::Connector*(void)>& callback) {
   return base::WrapUnique(new PlatformTestHelperMus(callback.Run(), identity));
 }
 
 }  // namespace
@@ skipping 13 matching lines @@
     // connector and identity are available at this point. This is because
     // WindowManagerConnection needs a ViewsDelegate and a MessageLoop to have
     // been installed first. So delay the creation until the necessary
     // dependencies have been met.
     PlatformTestHelper::set_factory(base::Bind(
         &CreatePlatformTestHelper, shell_identity_,
         base::Bind(&ShellConnection::GetConnector, base::Unretained(this))));
   }
 
   ~ShellConnection() {
-    if (views::WindowManagerConnection::Exists())
-      views::WindowManagerConnection::Reset();
     base::WaitableEvent wait(false, false);
     thread_.task_runner()->PostTask(
         FROM_HERE, base::Bind(&ShellConnection::TearDownConnections,
                               base::Unretained(this), &wait));
     wait.Wait();
   }
 
  private:
   shell::Connector* GetConnector() {
     shell_connector_.reset();
@@ skipping 66 matching lines @@
   ViewsTestSuite::Initialize();
   shell_connections_.reset(new ShellConnection);
 }
 
 void ViewsMusTestSuite::Shutdown() {
   shell_connections_.reset();
   ViewsTestSuite::Shutdown();
 }
 
 }  // namespace views