| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "content/browser/histogram_message_filter.h" | 5 #include "content/browser/histogram_message_filter.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
| 9 #include "base/metrics/statistics_recorder.h" | 9 #include "base/metrics/statistics_recorder.h" |
| 10 #include "content/browser/histogram_controller.h" | 10 #include "content/browser/histogram_controller.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 void HistogramMessageFilter::OnChildHistogramData( | 34 void HistogramMessageFilter::OnChildHistogramData( |
| 35 int sequence_number, | 35 int sequence_number, |
| 36 const std::vector<std::string>& pickled_histograms) { | 36 const std::vector<std::string>& pickled_histograms) { |
| 37 HistogramController::GetInstance()->OnHistogramDataCollected( | 37 HistogramController::GetInstance()->OnHistogramDataCollected( |
| 38 sequence_number, pickled_histograms); | 38 sequence_number, pickled_histograms); |
| 39 } | 39 } |
| 40 | 40 |
| 41 void HistogramMessageFilter::OnGetBrowserHistogram( | 41 void HistogramMessageFilter::OnGetBrowserHistogram( |
| 42 const std::string& name, | 42 const std::string& name, |
| 43 std::string* histogram_json) { | 43 std::string* histogram_json) { |
| 44 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); | 44 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
| 45 // Security: Only allow access to browser histograms when running in the | 45 // Security: Only allow access to browser histograms when running in the |
| 46 // context of a test. | 46 // context of a test. |
| 47 bool using_stats_collection_controller = | 47 bool using_stats_collection_controller = |
| 48 base::CommandLine::ForCurrentProcess()->HasSwitch( | 48 base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 49 switches::kStatsCollectionController); | 49 switches::kStatsCollectionController); |
| 50 if (!using_stats_collection_controller) { | 50 if (!using_stats_collection_controller) { |
| 51 LOG(ERROR) << "Attempt at reading browser histogram without specifying " | 51 LOG(ERROR) << "Attempt at reading browser histogram without specifying " |
| 52 << "--" << switches::kStatsCollectionController << " switch."; | 52 << "--" << switches::kStatsCollectionController << " switch."; |
| 53 return; | 53 return; |
| 54 } | 54 } |
| 55 base::HistogramBase* histogram = | 55 base::HistogramBase* histogram = |
| 56 base::StatisticsRecorder::FindHistogram(name); | 56 base::StatisticsRecorder::FindHistogram(name); |
| 57 if (!histogram) { | 57 if (!histogram) { |
| 58 *histogram_json = "{}"; | 58 *histogram_json = "{}"; |
| 59 } else { | 59 } else { |
| 60 histogram->WriteJSON(histogram_json); | 60 histogram->WriteJSON(histogram_json); |
| 61 } | 61 } |
| 62 } | 62 } |
| 63 | 63 |
| 64 } // namespace content | 64 } // namespace content |
| OLD | NEW |