Fix DesktopCaptureDeviceTest to shutdown worker pool

content/browser/media/capture/desktop_capture_device_unittest.cc

 // Copyright (c) 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 "content/browser/media/capture/desktop_capture_device.h"
 
 #include "base/basictypes.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
@@ skipping 123 matching lines @@
 };
 
 }  // namespace
 
 class DesktopCaptureDeviceTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
     worker_pool_ = new base::SequencedWorkerPool(3, "TestCaptureThread");
   }
 
+  virtual void TearDown() OVERRIDE {
+    worker_pool_->Shutdown();
+    message_loop_.RunUntilIdle();
+  }
+
   void CreateScreenCaptureDevice(scoped_ptr<webrtc::DesktopCapturer> capturer) {
     capture_device_.reset(new DesktopCaptureDevice(
         worker_pool_->GetSequencedTaskRunner(worker_pool_->GetSequenceToken()),
         thread_.Pass(),
         capturer.Pass(),
         DesktopMediaID::TYPE_SCREEN));
   }
 
  protected:
+  base::MessageLoop message_loop_;

[Ryan Sleevi, 2014/07/21 18:43:32]

Out of curiousity, does this use any //content BrowserThread concepts? Does it
make more sense to have a TestBrowserThreadBundle to support this (
http://src.chromium.org/viewvc/chrome/trunk/src/content/public/test/test_brow...
)

[Sergey Ulanov, 2014/07/22 00:08:22]

DesktopCaptureDevice::Create() does use BrowserThread, but
DesktopCaptureDevice::Create() is not used in the test because the test needs to
pass FakeScreenCapturer to the constructor.
But using TestBrowserThreadBundle does make this test cleaner. Done.

+
   scoped_refptr<base::SequencedWorkerPool> worker_pool_;
   scoped_ptr<base::Thread> thread_;
   scoped_ptr<DesktopCaptureDevice> capture_device_;
 };
 
 // There is currently no screen capturer implementation for ozone. So disable
 // the test that uses a real screen-capturer instead of FakeScreenCapturer.
 // http://crbug.com/260318
 #if defined(USE_OZONE)
 #define MAYBE_Capture DISABLED_Capture
@@ skipping 117 matching lines @@
   capture_device_->StopAndDeAllocate();
 
   EXPECT_EQ(kTestFrameWidth1, format.frame_size.width());
   EXPECT_EQ(kTestFrameHeight1, format.frame_size.height());
   EXPECT_EQ(kFrameRate, format.frame_rate);
   EXPECT_EQ(media::PIXEL_FORMAT_ARGB, format.pixel_format);
   worker_pool_->FlushForTesting();
 }
 
 }  // namespace content