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 27 matching lines @@
   DesktopMediaListAshTest() {}
   ~DesktopMediaListAshTest() override {}
 
   void CreateList(int source_types) {
     list_.reset(new DesktopMediaListAsh(source_types));
     list_->SetThumbnailSize(gfx::Size(kThumbnailSize, kThumbnailSize));
 
     // Set update period to reduce the time it takes to run tests.
     list_->SetUpdatePeriod(base::TimeDelta::FromMilliseconds(1));
   }
 

[sadrul, 2016/12/10 05:04:43]

I think you need to override TearDown() here:

  void TearDown() override {
    list_.reset();
    AshTestBase::TearDown();
  }

So that |list_| is destroyed before AshTestBase::TearDown() goes into a nested
message-loop cycle (and it happens for all tests).

Also, AshTestBase::TearDown() has a RunAllPendingInMessageLoop(). Are you sure
you need to do it again in AshTestHelper::TearDown()?

[Alex Z., 2016/12/10 14:03:39]

Yes, there needs to be a RenAllPendingInMessageLoop() after
Shell::DeleteInstance().

Done.

  protected:
   MockDesktopMediaListObserver observer_;
   std::unique_ptr<DesktopMediaListAsh> list_;
   DISALLOW_COPY_AND_ASSIGN(DesktopMediaListAshTest);
 };
 
 ACTION(QuitMessageLoop) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
 }
 
 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();
 }