Changed thread_checker on VideoCaptureImpl and VideoCaptureImplManager.

content/renderer/media/video_capture_impl_manager.h

 // Copyright (c) 2012 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.
 
-// TODO(hclam): This class should be renamed to VideoCaptureService.
-
-// This class provides access to a video capture device in the browser
-// process through IPC. The main function is to deliver video frames
-// to a client.
-//
-// THREADING
-//
-// VideoCaptureImplManager lives only on the render thread. All methods
-// must be called on this thread.
-//
-// VideoFrames are delivered on the IO thread. Callbacks provided by
-// a client are also called on the IO thread.
-
 #ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_MANAGER_H_
 #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_MANAGER_H_
 
 #include <map>
 
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 #include "content/common/media/video_capture.h"
 #include "content/public/renderer/media_stream_video_sink.h"
 #include "media/base/video_capture_types.h"
 
 namespace content {
 
 class VideoCaptureImpl;
 class VideoCaptureMessageFilter;
 
+// TODO(hclam): This class should be renamed to VideoCaptureService.
+
+// This class provides access to a video capture device in the browser
+// process through IPC. The main function is to deliver video frames
+// to a client.
+//
+// THREADING
+//
+// VideoCaptureImplManager lives only on the Render Main thread. All methods
+// must be called on this thread.
+//
+// VideoFrames are delivered on the IO thread. Callbacks provided by
+// a client are also called on the IO thread.
 class CONTENT_EXPORT VideoCaptureImplManager {
  public:
   VideoCaptureImplManager();
   virtual ~VideoCaptureImplManager();
 
   // Open a device associated with the session ID.
   // This method must be called before any methods with the same ID
   // is used.
   // Returns a callback that should be used to release the acquired
   // resources.
@@ skipping 57 matching lines @@
                    std::pair<int, VideoCaptureImpl*> >
       VideoCaptureDeviceMap;
   VideoCaptureDeviceMap devices_;
 
   // This is an internal ID for identifying clients of VideoCaptureImpl.
   // The ID is global for the render process.
   int next_client_id_;
 
   const scoped_refptr<VideoCaptureMessageFilter> filter_;
 
-  // Bound to the render thread.
-  base::ThreadChecker render_main_thread_checker_;
+  // Hold a pointer to the Render Main message loop to check we operate on the
+  // right thread.
+  const scoped_refptr<base::MessageLoopProxy> render_main_message_loop_;
 
   // Bound to the render thread.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoCaptureImplManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureImplManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_MANAGER_H_