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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 2761793002: Fix null argument to base::GetProcId in RenderProcessHostImpl::CreateMessageFilters. (Closed)
Patch Set: Updated unit test. Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after
1087 1087
1088 AddFilter(resource_message_filter_.get()); 1088 AddFilter(resource_message_filter_.get());
1089 1089
1090 media::AudioManager* audio_manager = 1090 media::AudioManager* audio_manager =
1091 BrowserMainLoop::GetInstance()->audio_manager(); 1091 BrowserMainLoop::GetInstance()->audio_manager();
1092 MediaStreamManager* media_stream_manager = 1092 MediaStreamManager* media_stream_manager =
1093 BrowserMainLoop::GetInstance()->media_stream_manager(); 1093 BrowserMainLoop::GetInstance()->media_stream_manager();
1094 // The AudioInputRendererHost and AudioRendererHost needs to be available for 1094 // The AudioInputRendererHost and AudioRendererHost needs to be available for
1095 // lookup, so it's stashed in a member variable. 1095 // lookup, so it's stashed in a member variable.
1096 audio_input_renderer_host_ = new AudioInputRendererHost( 1096 audio_input_renderer_host_ = new AudioInputRendererHost(
1097 GetID(), base::GetProcId(GetHandle()), audio_manager, 1097 GetID(), audio_manager, media_stream_manager,
1098 media_stream_manager, AudioMirroringManager::GetInstance(), 1098 AudioMirroringManager::GetInstance(),
1099 BrowserMainLoop::GetInstance()->user_input_monitor()); 1099 BrowserMainLoop::GetInstance()->user_input_monitor());
1100 AddFilter(audio_input_renderer_host_.get()); 1100 AddFilter(audio_input_renderer_host_.get());
1101 audio_renderer_host_ = new AudioRendererHost( 1101 audio_renderer_host_ = new AudioRendererHost(
1102 GetID(), audio_manager, BrowserMainLoop::GetInstance()->audio_system(), 1102 GetID(), audio_manager, BrowserMainLoop::GetInstance()->audio_system(),
1103 AudioMirroringManager::GetInstance(), media_stream_manager, 1103 AudioMirroringManager::GetInstance(), media_stream_manager,
1104 browser_context->GetResourceContext()->GetMediaDeviceIDSalt()); 1104 browser_context->GetResourceContext()->GetMediaDeviceIDSalt());
1105 AddFilter(audio_renderer_host_.get()); 1105 AddFilter(audio_renderer_host_.get());
1106 AddFilter( 1106 AddFilter(
1107 new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service())); 1107 new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
1108 AddFilter(new AppCacheDispatcherHost( 1108 AddFilter(new AppCacheDispatcherHost(
(...skipping 1983 matching lines...) Expand 10 before | Expand all | Expand 10 after
3092 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; 3092 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error;
3093 3093
3094 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. 3094 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing.
3095 // Capture the error message in a crash key value. 3095 // Capture the error message in a crash key value.
3096 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); 3096 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error);
3097 bad_message::ReceivedBadMessage(render_process_id, 3097 bad_message::ReceivedBadMessage(render_process_id,
3098 bad_message::RPH_MOJO_PROCESS_ERROR); 3098 bad_message::RPH_MOJO_PROCESS_ERROR);
3099 } 3099 }
3100 3100
3101 } // namespace content 3101 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698