Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / browser / histogram_message_filter.cc

diff --git a/src/content/browser/histogram_message_filter.cc b/src/content/browser/histogram_message_filter.cc
index f44accd..8eb7c72 100644 (file)
--- a/src/content/browser/histogram_message_filter.cc
+++ b/src/content/browser/histogram_message_filter.cc
@@ -14,18 +14,18 @@
 
 namespace content {
 
-HistogramMessageFilter::HistogramMessageFilter() {}
+HistogramMessageFilter::HistogramMessageFilter()
+    : BrowserMessageFilter(ChildProcessMsgStart) {}
 
-bool HistogramMessageFilter::OnMessageReceived(const IPC::Message& message,
-                                              bool* message_was_ok) {
+bool HistogramMessageFilter::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP_EX(HistogramMessageFilter, message, *message_was_ok)
+  IPC_BEGIN_MESSAGE_MAP(HistogramMessageFilter, message)
     IPC_MESSAGE_HANDLER(ChildProcessHostMsg_ChildHistogramData,
                         OnChildHistogramData)
     IPC_MESSAGE_HANDLER(ChildProcessHostMsg_GetBrowserHistogram,
                         OnGetBrowserHistogram)
     IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP_EX()
+  IPC_END_MESSAGE_MAP()
   return handled;
 }
 
@@ -45,7 +45,7 @@ void HistogramMessageFilter::OnGetBrowserHistogram(
   // Security: Only allow access to browser histograms when running in the
   // context of a test.
   bool using_stats_collection_controller =
-      CommandLine::ForCurrentProcess()->HasSwitch(
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kStatsCollectionController);
   if (!using_stats_collection_controller) {
     LOG(ERROR) << "Attempt at reading browser histogram without specifying "