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

Unified Diff: content/browser/browser_main_loop.cc

Issue 16267002: Re-fix http://crbug.com/87176, and add a test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Much shorter test Created 7 years, 6 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
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 56d8549a41cd985ee3057693b9864415522704e1..27d5e4cdbfc1e71e26885d927ae0035464e01f14 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -265,7 +265,9 @@ class BrowserMainLoop::MemoryObserver : public base::MessageLoop::TaskObserver {
// static
media::AudioManager* BrowserMainLoop::GetAudioManager() {
- return g_current_browser_main_loop->audio_manager_.get();
+ if (g_current_browser_main_loop)
+ return g_current_browser_main_loop->audio_manager_.get();
+ return NULL;
}
// static
@@ -275,7 +277,9 @@ AudioMirroringManager* BrowserMainLoop::GetAudioMirroringManager() {
// static
MediaStreamManager* BrowserMainLoop::GetMediaStreamManager() {
- return g_current_browser_main_loop->media_stream_manager_.get();
+ if (g_current_browser_main_loop)
+ return g_current_browser_main_loop->media_stream_manager_.get();
+ return NULL;
}
// BrowserMainLoop construction / destruction =============================

Powered by Google App Engine
This is Rietveld 408576698