Fixes crash in ~ShellConnection

ui/views/mus/display_list_unittest.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/display_list.h"
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 53 matching lines @@
     AddPartChange(changed_metrics, DISPLAY_METRIC_PRIMARY, "primary", &parts);
 
     AddChange("Changed id=" + base::Int64ToString(display.id()) + parts);
   }
 
   std::string changes_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayObserverImpl);
 };
 
-// Test fails on linux_chromium_rel_ng, http://crbug.com/613018
-TEST(DisplayListTest, DISABLED_AddUpdateRemove) {
+TEST(DisplayListTest, AddUpdateRemove) {
   DisplayList display_list;
   DisplayObserverImpl observer;
   display_list.AddObserver(&observer);
   display_list.AddDisplay(display::Display(2, gfx::Rect(0, 0, 801, 802)),
                           DisplayList::Type::PRIMARY);
   EXPECT_EQ("Added id=2", observer.GetAndClearChanges());
 
   // Update the bounds.
   {
     display::Display updated_display = *(display_list.displays().begin());
@@ skipping 19 matching lines @@
 
   // Delete the first.
   display_list.RemoveDisplay(2);
   ASSERT_EQ(1u, display_list.displays().size());
   EXPECT_EQ("Removed id=2", observer.GetAndClearChanges());
   EXPECT_EQ(3, display_list.GetPrimaryDisplayIterator()->id());
 }
 
 }  // namespace
 }  // namespace views