| Index: content/browser/renderer_host/render_message_filter.cc
|
| diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
|
| index 435f1a0e0bdac3c6c9793b03fd1ad1149a766fbd..5c0eaa9f99f29fb37c68cba3c5acffb431baf376 100644
|
| --- a/content/browser/renderer_host/render_message_filter.cc
|
| +++ b/content/browser/renderer_host/render_message_filter.cc
|
| @@ -107,10 +107,6 @@ namespace {
|
| const int kPluginsRefreshThresholdInSeconds = 3;
|
| #endif
|
|
|
| -// When two CPU usage queries arrive within this interval, we sample the CPU
|
| -// usage only once and send it as a response for both queries.
|
| -static const int64 kCPUUsageSampleIntervalMs = 900;
|
| -
|
| const uint32 kFilteredMessageClasses[] = {
|
| ChildProcessMsgStart,
|
| DesktopNotificationMsgStart,
|
| @@ -349,7 +345,6 @@ RenderMessageFilter::RenderMessageFilter(
|
| incognito_(browser_context->IsOffTheRecord()),
|
| dom_storage_context_(dom_storage_context),
|
| render_process_id_(render_process_id),
|
| - cpu_usage_(0),
|
| audio_manager_(audio_manager),
|
| media_internals_(media_internals) {
|
| DCHECK(request_context_.get());
|
| @@ -388,18 +383,6 @@ void RenderMessageFilter::OnChannelClosing() {
|
| #endif
|
| }
|
|
|
| -void RenderMessageFilter::OnChannelConnected(int32 peer_id) {
|
| - base::ProcessHandle handle = PeerHandle();
|
| -#if defined(OS_MACOSX)
|
| - process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(handle,
|
| - NULL));
|
| -#else
|
| - process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(handle));
|
| -#endif
|
| - cpu_usage_ = process_metrics_->GetCPUUsage(); // Initialize CPU usage counters
|
| - cpu_usage_sample_time_ = base::TimeTicks::Now();
|
| -}
|
| -
|
| bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(RenderMessageFilter, message)
|
| @@ -469,7 +452,6 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_DidGenerateCacheableMetadata,
|
| OnCacheableMetadataAvailable)
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_Keygen, OnKeygen)
|
| - IPC_MESSAGE_HANDLER(ViewHostMsg_GetCPUUsage, OnGetCPUUsage)
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_GetAudioHardwareConfig,
|
| OnGetAudioHardwareConfig)
|
| #if defined(OS_WIN)
|
| @@ -870,16 +852,6 @@ void RenderMessageFilter::OnGenerateRoutingID(int* route_id) {
|
| *route_id = render_widget_helper_->GetNextRoutingID();
|
| }
|
|
|
| -void RenderMessageFilter::OnGetCPUUsage(int* cpu_usage) {
|
| - base::TimeTicks now = base::TimeTicks::Now();
|
| - int64 since_last_sample_ms = (now - cpu_usage_sample_time_).InMilliseconds();
|
| - if (since_last_sample_ms > kCPUUsageSampleIntervalMs) {
|
| - cpu_usage_sample_time_ = now;
|
| - cpu_usage_ = static_cast<int>(process_metrics_->GetCPUUsage());
|
| - }
|
| - *cpu_usage = cpu_usage_;
|
| -}
|
| -
|
| void RenderMessageFilter::OnGetAudioHardwareConfig(
|
| media::AudioParameters* input_params,
|
| media::AudioParameters* output_params) {
|
|
|