Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Unified Diff: media/cast/test/fake_media_source.h

Issue 598023004: [src/media] Declaring the weak_ptr_factory in proper order in cast,mojo and filters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments are incorporated. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/cast/test/fake_media_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/test/fake_media_source.h
diff --git a/media/cast/test/fake_media_source.h b/media/cast/test/fake_media_source.h
index b18d44ea2a8e566751f4e25a2d159a1cad1a7ab6..835fb957943829693f4db63dd208346b49fb8953 100644
--- a/media/cast/test/fake_media_source.h
+++ b/media/cast/test/fake_media_source.h
@@ -112,9 +112,6 @@ class FakeMediaSource {
int video_frame_count_;
scoped_ptr<TestAudioBusFactory> audio_bus_factory_;
- // NOTE: Weak pointers must be invalidated before all other member variables.
- base::WeakPtrFactory<FakeMediaSource> weak_factory_;
-
base::MemoryMappedFile file_data_;
scoped_ptr<InMemoryUrlProtocol> protocol_;
scoped_ptr<FFmpegGlue> glue_;
@@ -143,6 +140,9 @@ class FakeMediaSource {
std::queue<AudioBus*> audio_bus_queue_;
+ // NOTE: Weak pointers must be invalidated before all other member variables.
+ base::WeakPtrFactory<FakeMediaSource> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(FakeMediaSource);
};
« no previous file with comments | « no previous file | media/cast/test/fake_media_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698