Split UserMetrics into API vs. implementation. Move API to content/public.

content/browser/browser_message_filter.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_message_filter.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/process.h"
 #include "base/process_util.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "content/public/common/result_codes.h"
 #include "ipc/ipc_sync_message.h"
 
 using content::BrowserThread;
+using content::UserMetricsAction;
 
 BrowserMessageFilter::BrowserMessageFilter()
     : channel_(NULL), peer_handle_(base::kNullProcessHandle) {
 }
 
 BrowserMessageFilter::~BrowserMessageFilter() {
   base::CloseProcessHandle(peer_handle_);
 }
 
 void BrowserMessageFilter::OnFilterAdded(IPC::Channel* channel) {
@@ skipping 55 matching lines @@
           base::Bind(&BrowserMessageFilter::DispatchMessage, this, message)));
   return true;
 }
 
 bool BrowserMessageFilter::DispatchMessage(const IPC::Message& message) {
   bool message_was_ok = true;
   bool rv = OnMessageReceived(message, &message_was_ok);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO) || rv) <<
       "Must handle messages that were dispatched to another thread!";
   if (!message_was_ok) {
-    UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_BMF"));
+    content::RecordAction(UserMetricsAction("BadMessageTerminate_BMF"));
     BadMessageReceived();
   }
 
   return rv;
 }
 
 void BrowserMessageFilter::BadMessageReceived() {
   base::KillProcess(peer_handle(), content::RESULT_CODE_KILLED_BAD_MESSAGE,
                     false);
 }
@@ skipping 15 matching lines @@
         "messages in the renderer or else deadlocks can occur if the page "
         "has windowed plugins! (message type " << message.type() << ")";
     IPC::Message* reply = IPC::SyncMessage::GenerateReply(&message);
     reply->set_reply_error();
     sender->Send(reply);
     return false;
   }
 #endif
   return true;
 }