content: convert user action notification to observer usage

content/browser/user_metrics.cc

Index: content/browser/user_metrics.cc
diff --git a/content/browser/user_metrics.cc b/content/browser/user_metrics.cc
index 927f3977d6b589f3363ca1c3d9b4a594d48c36ff..93260a8355ea4e2bd16f3a403cf926182235f801 100644
--- a/content/browser/user_metrics.cc
+++ b/content/browser/user_metrics.cc
@@ -4,14 +4,18 @@
 
 #include "content/public/browser/user_metrics.h"
 
+#include <vector>
+
 #include "base/bind.h"
+#include "base/lazy_instance.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_types.h"
 
 namespace content {
 namespace {
 
+base::LazyInstance<std::vector<ActionCallback> > g_action_callbacks =
+    LAZY_INSTANCE_INITIALIZER;
+
 // Forward declare because of circular dependency.
 void CallRecordOnUI(const std::string& action);
 
@@ -24,10 +28,8 @@ void Record(const char *action) {
     return;
   }
 
-  NotificationService::current()->Notify(
-      NOTIFICATION_USER_ACTION,
-      NotificationService::AllSources(),
-      Details<const char*>(&action));
+  for (size_t i = 0; i < g_action_callbacks.Get().size(); i++)
+    g_action_callbacks.Get()[i].Run(action);
 }
 
 void CallRecordOnUI(const std::string& action) {
@@ -44,4 +46,19 @@ void RecordComputedAction(const std::string& action) {
   Record(action.c_str());
 }
 
+void AddActionCallback(const ActionCallback& callback) {
+  g_action_callbacks.Get().push_back(callback);
+}
+
+void RemoveActionCallback(const ActionCallback& callback) {
+  for (std::vector<ActionCallback>::iterator i =

[jam, 2013/01/31 18:02:29]

nit: size_t here too

[Paweł Hajdan Jr., 2013/02/01 10:43:57]

Done.

+           g_action_callbacks.Get().begin();
+       i != g_action_callbacks.Get().end();
+       ++i) {
+    if ((*i).Equals(callback)) {
+      i = g_action_callbacks.Get().erase(i);
+    }
+  }
+}
+
 }  // namespace content