CPM Refactor and Cleanup

chrome/browser/performance_monitor/performance_monitor_util.cc

 // Copyright (c) 2012 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 "chrome/browser/performance_monitor/performance_monitor_util.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 46 matching lines @@
     const tracked_objects::Location& from_here,
     const base::Closure& request,
     const base::Closure& reply) {
   base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
   base::SequencedWorkerPool::SequenceToken token =
       pool->GetNamedSequenceToken(Database::kDatabaseSequenceToken);
   return pool->GetSequencedTaskRunner(token)->PostTaskAndReply(
       from_here, request, reply);
 }
 
-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) {
-  events::ExtensionInstall event;
-  event.event_type = EVENT_EXTENSION_INSTALL;
+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) {
+  events::ExtensionEvent event;
+  event.event_type = type;
   event.time = static_cast<double>(time.ToInternalValue());
   event.extension_id = id;
   event.extension_name = name;
-  event.extension_url = url;
-  event.extension_location = location;
-  event.extension_version = version;
-  event.extension_description = description;
-  scoped_ptr<base::DictionaryValue> value = event.ToValue();
-  return scoped_ptr<Event>(new Event(
-      EVENT_EXTENSION_INSTALL, time, value.Pass()));
-}
-
-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) {
-  events::ExtensionUninstall event;
-  event.event_type = EVENT_EXTENSION_UNINSTALL;
-  event.time = static_cast<double>(time.ToInternalValue());
-  event.extension_id = id;
-  event.extension_name = name;
-  event.extension_url = url;
-  event.extension_location = location;
-  event.extension_version = version;
-  event.extension_description = description;
-  scoped_ptr<base::DictionaryValue> value = event.ToValue();
-  return scoped_ptr<Event>(new Event(
-      EVENT_EXTENSION_UNINSTALL, time, value.Pass()));
-}
-
-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) {
-  events::ExtensionUnload event;
-  event.event_type = EVENT_EXTENSION_UNLOAD;
-  event.time = static_cast<double>(time.ToInternalValue());
-  event.extension_id = id;
-  event.extension_name = name;
-  event.extension_url = url;
-  event.extension_location = location;
-  event.extension_version = version;
-  event.extension_description = description;
-  event.unload_reason = reason;
-  scoped_ptr<base::DictionaryValue> value = event.ToValue();
-  return scoped_ptr<Event>(new Event(
-      EVENT_EXTENSION_UNLOAD, time, value.Pass()));
-}
-
-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) {
-  events::ExtensionEnable event;
-  event.event_type = EVENT_EXTENSION_ENABLE;
-  event.time = static_cast<double>(time.ToInternalValue());
-  event.extension_id = id;
-  event.extension_name = name;
-  event.extension_url = url;
-  event.extension_location = location;
-  event.extension_version = version;
-  event.extension_description = description;
-  scoped_ptr<base::DictionaryValue> value = event.ToValue();
-  return scoped_ptr<Event>(new Event(
-      EVENT_EXTENSION_ENABLE, time, value.Pass()));
-}
-
-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) {
-  events::ExtensionUpdate event;
-  event.event_type = EVENT_EXTENSION_UPDATE;
-  event.time = static_cast<double>(time.ToInternalValue());
-  event.extension_id = id;
-  event.extension_name = name;
   event.extension_url = url;
   event.extension_location = location;
   event.extension_version = version;
   event.extension_description = description;
   scoped_ptr<base::DictionaryValue> value = event.ToValue();
   return scoped_ptr<Event>(new Event(
-      EVENT_EXTENSION_UPDATE, time, value.Pass()));
+      type, time, value.Pass()));
 }
 
 scoped_ptr<Event> CreateRendererFreezeEvent(const base::Time& time,
                                             const std::string& url) {
   events::RendererFreeze event;
   event.event_type = EVENT_RENDERER_FREEZE;
   event.time = static_cast<double>(time.ToInternalValue());
   event.url = url;
   scoped_ptr<base::DictionaryValue> value = event.ToValue();
   return scoped_ptr<Event>(new Event(
@@ skipping 28 matching lines @@
   event.time = static_cast<double>(time.ToInternalValue());
   event.previous_version = previous_version;
   event.current_version = current_version;
   scoped_ptr<base::DictionaryValue> value = event.ToValue();
   return scoped_ptr<Event>(new Event(
       EVENT_CHROME_UPDATE, time, value.Pass()));
 }
 
 }  // namespace util
 }  // namespace performance_monitor