Deprecate NonThreadSafe in content/renderer/media in favor of SequenceChecker.

content/renderer/media/media_stream_video_source.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/optional.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/sequence_checker.h"
 #include "content/common/content_export.h"
 #include "content/common/media/video_capture.h"
 #include "content/renderer/media/media_stream_source.h"
 #include "content/renderer/media/secure_display_link_tracker.h"
 #include "media/base/video_frame.h"
 #include "media/capture/video_capture_types.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 
@@ skipping 12 matching lines @@
 // MediaStreaVideoSources such as local video capture, video sources received
 // on a PeerConnection or a source created in NaCl.
 // All methods calls will be done from the main render thread.
 //
 // When the first track is added to the source by calling AddTrack, the
 // MediaStreamVideoSource implementation calls GetCurrentSupportedFormats.
 // The source implementation must call OnSupportedFormats.
 // MediaStreamVideoSource then match the constraints provided in AddTrack with
 // the formats and call StartSourceImpl. The source implementation must call
 // OnStartDone when the underlying source has been started or failed to start.
-class CONTENT_EXPORT MediaStreamVideoSource
-    : public MediaStreamSource,
-      NON_EXPORTED_BASE(public base::NonThreadSafe) {
+class CONTENT_EXPORT MediaStreamVideoSource : public MediaStreamSource {
  public:
   enum {
     // Default resolution. If no constraints are specified and the delegate
     // support it, this is the resolution that will be used.
     kDefaultWidth = 640,
     kDefaultHeight = 480,
 
     kDefaultFrameRate = 30,
     kUnknownFrameRate = 0,
   };
@@ skipping 97 matching lines @@
   enum State {
     NEW,
     // TODO(guidou): Remove this state. http://crbug.com/706408
     RETRIEVING_CAPABILITIES,
     STARTING,
     STARTED,
     ENDED
   };
   State state() const { return state_; }
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
  private:
   void OnSupportedFormats(const media::VideoCaptureFormats& formats);
 
   // Finds the first WebMediaConstraints in |track_descriptors_| that allows
   // the use of one of the |formats|.  |best_format| and |fulfilled_constraints|
   // are set to the results of this search-and-match operation.  Returns false
   // if no WebMediaConstraints allow the use any of the |formats|.
   bool FindBestFormatWithConstraints(
       const media::VideoCaptureFormats& formats,
       media::VideoCaptureFormat* best_format,
@@ skipping 56 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaStreamVideoSource> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoSource);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_