Change primordial pipes to ShellClient

components/mus/ws/display_manager.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 "components/mus/ws/display_manager.h"
 
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/display_manager_delegate.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/user_display_manager.h"
@@ skipping 23 matching lines @@
 }
 
 void DisplayManager::AddDisplay(Display* display) {
   DCHECK_EQ(0u, pending_displays_.count(display));
   pending_displays_.insert(display);
 }
 
 void DisplayManager::DestroyDisplay(Display* display) {
   if (pending_displays_.count(display)) {
     pending_displays_.erase(display);
-  } else {
+  } else if (displays_.count(display)) {
     for (const auto& pair : user_display_managers_)
       pair.second->OnWillDestroyDisplay(display);
+    displays_.erase(display);
+  } else {
+    // NOTE: This may fuction may be re-entered with the same |display| in which
+    // case we need to avoid a double-free. This should probably be considered a
+    // bug. This was hidden before due to the fact that the mus app exited
+    // uncleanly in tests.
+    DLOG(WARNING) << "Trying to destroy the same display twice.";
+    return;
+  }
 
-    DCHECK(displays_.count(display));
-    displays_.erase(display);
-  }
   delete display;
 
   // If we have no more roots left, let the app know so it can terminate.
   // TODO(sky): move to delegate/observer.
   if (!displays_.size() && !pending_displays_.size())
     delegate_->OnNoMoreDisplays();
 }
 
 void DisplayManager::DestroyAllDisplays() {
   while (!pending_displays_.empty())
@@ skipping 76 matching lines @@
   DCHECK_EQ(0u, displays_.count(display));
   const bool is_first_display = displays_.empty();
   displays_.insert(display);
   pending_displays_.erase(display);
   if (is_first_display)
     delegate_->OnFirstDisplayReady();
 }
 
 }  // namespace ws
 }  // namespace mus