CPM Refactor and Cleanup

chrome/browser/performance_monitor/performance_monitor_util.h

Index: chrome/browser/performance_monitor/performance_monitor_util.h
diff --git a/chrome/browser/performance_monitor/performance_monitor_util.h b/chrome/browser/performance_monitor/performance_monitor_util.h
index dbe4381d405c89ece53b25fb231cffd7cb6a9134..9d2eca288b54a427b4d553cc2678abb89d227c96 100644
--- a/chrome/browser/performance_monitor/performance_monitor_util.h
+++ b/chrome/browser/performance_monitor/performance_monitor_util.h
@@ -38,67 +38,27 @@ bool PostTaskToDatabaseThreadAndReply(
 // pertinent information, given all the fields. Please use these methods to
 // create any PerformanceMonitor events, as this will ensure strong-typing
 // guards that performance_monitor::Event() will not.
-scoped_ptr<Event> CreateExtensionInstallEvent(
-    const base::Time& time,
-    const std::string& id,
-    const std::string& name,
-    const std::string& url,
-    const int& location,
-    const std::string& version,
-    const std::string& description);
+scoped_ptr<Event> CreateExtensionEvent(const EventType type,
+                                       const base::Time& time,
+                                       const std::string& id,
+                                       const std::string& name,
+                                       const std::string& url,
+                                       const int location,
+                                       const std::string& version,
+                                       const std::string& description);
 
-scoped_ptr<Event> CreateExtensionUnloadEvent(
-    const base::Time& time,
-    const std::string& id,
-    const std::string& name,
-    const std::string& url,
-    const int& location,
-    const std::string& version,
-    const std::string& description,
-    const extension_misc::UnloadedExtensionReason& reason);
+scoped_ptr<Event> CreateRendererFreezeEvent(const base::Time& time,
+                                            const std::string& url);
 
-scoped_ptr<Event> CreateExtensionUninstallEvent(
-    const base::Time& time,
-    const std::string& id,
-    const std::string& name,
-    const std::string& url,
-    const int& location,
-    const std::string& version,
-    const std::string& description);
-
-scoped_ptr<Event> CreateExtensionEnableEvent(
-    const base::Time& time,
-    const std::string& id,
-    const std::string& name,
-    const std::string& url,
-    const int& location,
-    const std::string& version,
-    const std::string& description);
-
-scoped_ptr<Event> CreateExtensionUpdateEvent(
-    const base::Time& time,
-    const std::string& id,
-    const std::string& name,
-    const std::string& url,
-    const int& location,
-    const std::string& version,
-    const std::string& description);
-
-scoped_ptr<Event> CreateRendererFreezeEvent(
-    const base::Time& time,
-    const std::string& url);
-
-scoped_ptr<Event> CreateCrashEvent(
-    const base::Time& time,
-    const EventType& type);
+scoped_ptr<Event> CreateCrashEvent(const base::Time& time,
+                                   const EventType& type);
 
 scoped_ptr<Event> CreateUncleanExitEvent(const base::Time& time,
                                          const std::string& profile_name);
 
-scoped_ptr<Event> CreateChromeUpdateEvent(
-    const base::Time& time,
-    const std::string& previous_version,
-    const std::string& current_version);
+scoped_ptr<Event> CreateChromeUpdateEvent(const base::Time& time,
+                                          const std::string& previous_version,
+                                          const std::string& current_version);
 
 }  // namespace util
 }  // namespace performance_monitor