Fix chromium-style errors for WeakPtrFactory member order in Chromecast
This check just got turned on upstream, see crrev.com/803603003 BUG= Review URL: https://codereview.chromium.org/857573004 Cr-Commit-Position: refs/heads/master@{#311920}
This commit is contained in:
chromecast/media/cma/pipeline
@ -67,8 +67,8 @@ class AudioPipelineImpl : public AudioPipeline {
|
||||
|
||||
::media::PipelineStatistics previous_stats_;
|
||||
|
||||
base::WeakPtrFactory<AudioPipelineImpl> weak_factory_;
|
||||
base::WeakPtr<AudioPipelineImpl> weak_this_;
|
||||
base::WeakPtrFactory<AudioPipelineImpl> weak_factory_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(AudioPipelineImpl);
|
||||
};
|
||||
|
@ -160,8 +160,8 @@ class AvPipelineImpl {
|
||||
BrowserCdmCast* media_keys_;
|
||||
int media_keys_callback_id_;
|
||||
|
||||
base::WeakPtrFactory<AvPipelineImpl> weak_factory_;
|
||||
base::WeakPtr<AvPipelineImpl> weak_this_;
|
||||
base::WeakPtrFactory<AvPipelineImpl> weak_factory_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(AvPipelineImpl);
|
||||
};
|
||||
|
@ -100,8 +100,8 @@ class MediaPipelineImpl : public MediaPipeline {
|
||||
// period.
|
||||
int statistics_rolling_counter_;
|
||||
|
||||
base::WeakPtrFactory<MediaPipelineImpl> weak_factory_;
|
||||
base::WeakPtr<MediaPipelineImpl> weak_this_;
|
||||
base::WeakPtrFactory<MediaPipelineImpl> weak_factory_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(MediaPipelineImpl);
|
||||
};
|
||||
|
@ -70,8 +70,8 @@ class VideoPipelineImpl : public VideoPipeline {
|
||||
|
||||
::media::PipelineStatistics previous_stats_;
|
||||
|
||||
base::WeakPtrFactory<VideoPipelineImpl> weak_factory_;
|
||||
base::WeakPtr<VideoPipelineImpl> weak_this_;
|
||||
base::WeakPtrFactory<VideoPipelineImpl> weak_factory_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(VideoPipelineImpl);
|
||||
};
|
||||
|
Reference in New Issue
Block a user