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

ui/views/mus/views_mus_test_suite.cc

Index: ui/views/mus/views_mus_test_suite.cc
diff --git a/ui/views/mus/views_mus_test_suite.cc b/ui/views/mus/views_mus_test_suite.cc
index ea8e031c8e95391819f71564661c9a0d699c296b..8ed0500997c1b6445778f090d73c9767ff24e2e8 100644
--- a/ui/views/mus/views_mus_test_suite.cc
+++ b/ui/views/mus/views_mus_test_suite.cc
@@ -46,11 +46,13 @@ class PlatformTestHelperMus : public PlatformTestHelper {
                         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);
 };
 
@@ -84,8 +86,6 @@ class ShellConnection {
   }
 
   ~ShellConnection() {
-    if (views::WindowManagerConnection::Exists())
-      views::WindowManagerConnection::Reset();
     base::WaitableEvent wait(false, false);
     thread_.task_runner()->PostTask(
         FROM_HERE, base::Bind(&ShellConnection::TearDownConnections,