Fix teardown of a couple of test suites

content/browser/renderer_host/media/video_capture_controller_unittest.cc

Index: content/browser/renderer_host/media/video_capture_controller_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
index 9af6feeae0daabc0040d1c05f58631584a063ac5..260222572c80741e8bf3aea50801f59123c8ef58 100644
--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -124,11 +124,14 @@ class VideoCaptureControllerTest : public testing::Test {
         base::SharedMemory::NULLHandle(), 0u, base::TimeDelta());
   }
 
-  TestBrowserThreadBundle bundle_;
   scoped_ptr<MockVideoCaptureControllerEventHandler> client_a_;
   scoped_ptr<MockVideoCaptureControllerEventHandler> client_b_;
   scoped_ptr<VideoCaptureController> controller_;
   scoped_ptr<media::VideoCaptureDevice::Client> device_;
+  // Construct/destruct the thread bundle last/first respectively to make sure
+  // that the IO thread is torn down before the main thread goes away, as it
+  // does when running in Chrome.
+  TestBrowserThreadBundle bundle_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureControllerTest);