CPM Refactor and Cleanup

chrome/browser/performance_monitor/database_unittest.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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 53 matching lines @@
   scoped_ptr<Database> db_;
   Database::Clock* clock_;
   ScopedTempDir temp_dir_;
   scoped_ptr<Event> install_event_1_;
   scoped_ptr<Event> install_event_2_;
   scoped_ptr<Event> uninstall_event_1_;
   scoped_ptr<Event> uninstall_event_2_;
 
  private:
   void InitEvents() {
-    install_event_1_ = util::CreateExtensionInstallEvent(
-        clock_->GetTime(), "a", "extension 1", "http://foo.com",
-        static_cast<int>(Extension::LOAD), "0.1", "Test Test");
-    install_event_2_ = util::CreateExtensionInstallEvent(
-        clock_->GetTime(), "b", "extension 2", "http://bar.com",
-        static_cast<int>(Extension::LOAD), "0.1", "Test Test");
-    uninstall_event_1_ = util::CreateExtensionUninstallEvent(
-        clock_->GetTime(), "a", "extension 1", "http://foo.com",
-        static_cast<int>(Extension::LOAD), "0.1", "Test Test");
-    uninstall_event_2_ = util::CreateExtensionUninstallEvent(
-        clock_->GetTime(), "b", "extension 2", "http://bar.com",
-        static_cast<int>(Extension::LOAD), "0.1", "Test Test");
+    install_event_1_ = util::CreateExtensionEvent(
+        EVENT_EXTENSION_INSTALL, clock_->GetTime(), "a", "extension 1",
+        "http://foo.com", static_cast<int>(Extension::LOAD), "0.1",
+        "Test Test");
+    install_event_2_ = util::CreateExtensionEvent(
+        EVENT_EXTENSION_INSTALL, clock_->GetTime(), "b", "extension 2",
+        "http://bar.com", static_cast<int>(Extension::LOAD), "0.1",
+        "Test Test");
+    uninstall_event_1_ = util::CreateExtensionEvent(
+        EVENT_EXTENSION_UNINSTALL, clock_->GetTime(), "a", "extension 1",
+        "http://foo.com", static_cast<int>(Extension::LOAD), "0.1",
+        "Test Test");
+    uninstall_event_2_ = util::CreateExtensionEvent(
+        EVENT_EXTENSION_UNINSTALL, clock_->GetTime(), "b", "extension 2",
+        "http://bar.com", static_cast<int>(Extension::LOAD), "0.1",
+        "Test Test");
   }
 };
 
 class PerformanceMonitorDatabaseMetricTest : public ::testing::Test {
  protected:
   PerformanceMonitorDatabaseMetricTest() {
     clock_ = new TestingClock();
     CHECK(temp_dir_.CreateUniqueTempDir());
     db_ = Database::Create(temp_dir_.path());
     CHECK(db_.get());
@@ skipping 138 matching lines @@
 TEST_F(PerformanceMonitorDatabaseEventTest, GetInstallEvents) {
   std::vector<linked_ptr<Event> > events =
       db_->GetEvents(EVENT_EXTENSION_INSTALL);
   ASSERT_EQ(2u, events.size());
   EXPECT_TRUE(events[0]->data()->Equals(install_event_1_->data()));
   EXPECT_TRUE(events[1]->data()->Equals(install_event_2_->data()));
 }
 
 TEST_F(PerformanceMonitorDatabaseEventTest, GetUnusedEventType) {
   std::vector<linked_ptr<Event> > events =
-      db_->GetEvents(EVENT_EXTENSION_UNLOAD);
+      db_->GetEvents(EVENT_EXTENSION_DISABLE);
   ASSERT_TRUE(events.empty());
-  events = db_->GetEvents(EVENT_EXTENSION_UNLOAD, clock_->GetTime(),
+  events = db_->GetEvents(EVENT_EXTENSION_DISABLE, clock_->GetTime(),
                           clock_->GetTime());
   ASSERT_TRUE(events.empty());
 }
 
 TEST_F(PerformanceMonitorDatabaseEventTest, GetEventsTimeRange) {
   base::Time start_time = clock_->GetTime();
   scoped_ptr<Event> new_install_event =
-      util::CreateExtensionInstallEvent(
-      clock_->GetTime(), "c", "test extension", "http://foo.com",
-      static_cast<int>(Extension::LOAD), "0.1", "Test Test");
+      util::CreateExtensionEvent(EVENT_EXTENSION_INSTALL, clock_->GetTime(),
+                                 "c", "test extension", "http://foo.com",
+                                 static_cast<int>(Extension::LOAD), "0.1",
+                                 "Test Test");
   scoped_ptr<Event> new_uninstall_event =
-      util::CreateExtensionUninstallEvent(
-      clock_->GetTime(), "c", "test extension", "http://foo.com",
-      static_cast<int>(Extension::LOAD), "0.1", "Test Test");
+      util::CreateExtensionEvent(EVENT_EXTENSION_UNINSTALL, clock_->GetTime(),
+                                 "c", "test extension", "http://foo.com",
+                                 static_cast<int>(Extension::LOAD), "0.1",
+                                 "Test Test");
   base::Time end_time = clock_->GetTime();
   db_->AddEvent(*new_install_event.get());
   db_->AddEvent(*new_uninstall_event.get());
   std::vector<linked_ptr<Event> > events =
       db_->GetEvents(start_time, end_time);
   ASSERT_EQ(2u, events.size());
   EXPECT_TRUE(events[0]->data()->Equals(new_install_event->data()));
   EXPECT_TRUE(events[1]->data()->Equals(new_uninstall_event->data()));
   events = db_->GetEvents(
       EVENT_EXTENSION_INSTALL, start_time, end_time);
@@ skipping 112 matching lines @@
   base::Time end = clock_->GetTime();
   db_->AddMetric(kProcessChromeAggregate, METRIC_CPU_USAGE, std::string("21"));
   Database::MetricInfoVector stats =
       db_->GetStatsForActivityAndMetric(METRIC_CPU_USAGE, start, end);
   ASSERT_EQ(2u, stats.size());
   ASSERT_EQ(3, stats[0].value);
   ASSERT_EQ(9, stats[1].value);
 }
 
 }  // namespace performance_monitor