Revert of Change exo::SurfaceFactoryOwner to exo::ExoCompositorFrameSink

chrome/browser/media/webrtc/desktop_media_list_ash_unittest.cc

 // Copyright 2013 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 "chrome/browser/media/webrtc/desktop_media_list_ash.h"
 
 #include "ash/test/ash_test_base.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 48 matching lines @@
 
 TEST_F(DesktopMediaListAshTest, Screen) {
   CreateList(DesktopMediaListAsh::SCREENS | DesktopMediaListAsh::WINDOWS);
 
   EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 0));
   EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 0))
       .WillOnce(QuitMessageLoop())
       .WillRepeatedly(DoDefault());
   list_->StartUpdating(&observer_);
   base::RunLoop().Run();
-
-  // Reset the unique_ptr so the list stops refreshing.
-  list_.reset();
 }
 
 TEST_F(DesktopMediaListAshTest, OneWindow) {
   CreateList(DesktopMediaListAsh::SCREENS | DesktopMediaListAsh::WINDOWS);
 
   std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
 
   EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 0));
   EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 1));
   EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 0))
@@ skipping 34 matching lines @@
       .WillOnce(QuitMessageLoop())
       .WillRepeatedly(DoDefault());
   EXPECT_CALL(observer_, OnSourceRemoved(list_.get(), 0))
       .WillOnce(QuitMessageLoop());
 
   list_->StartUpdating(&observer_);
   base::RunLoop().Run();
   window.reset();
   base::RunLoop().Run();
 }