diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 19:22:51 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 19:22:51 +0000 |
| commit | f74d7f303d34d1473c51f2194cf19396f3ab288a (patch) | |
| tree | e6332a6cdde7a3e297664a64e8c5c41a972a3139 /chrome/browser/performance_monitor/database_unittest.cc | |
| parent | 2f8757c314dbae44b10fa19f15d1ccf69361680f (diff) | |
| download | chromium_src-f74d7f303d34d1473c51f2194cf19396f3ab288a.zip chromium_src-f74d7f303d34d1473c51f2194cf19396f3ab288a.tar.gz chromium_src-f74d7f303d34d1473c51f2194cf19396f3ab288a.tar.bz2 | |
CPM Extension Event Watching
Adding in main infrastructure for a CPM observation class, which will be
expanded later. Right now, this includes support for watching for extension
events including:
- Install
- Enable
- Disable
- Update
(Uninstall requires a little bit more change, and will be included in a separate CL)
BUG=130212
TEST=NONE
Review URL: https://chromiumcodereview.appspot.com/10545022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/performance_monitor/database_unittest.cc')
| -rw-r--r-- | chrome/browser/performance_monitor/database_unittest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/performance_monitor/database_unittest.cc b/chrome/browser/performance_monitor/database_unittest.cc index d54ced2..ebf383f 100644 --- a/chrome/browser/performance_monitor/database_unittest.cc +++ b/chrome/browser/performance_monitor/database_unittest.cc @@ -46,7 +46,7 @@ class PerformanceMonitorDatabaseEventTest : public ::testing::Test { } void SetUp() { - ASSERT_TRUE(db_); + ASSERT_TRUE(db_.get()); PopulateDB(); } @@ -58,7 +58,7 @@ class PerformanceMonitorDatabaseEventTest : public ::testing::Test { db_->AddEvent(*uninstall_event_2_.get()); } - scoped_refptr<Database> db_; + scoped_ptr<Database> db_; Database::Clock* clock_; FilePath temp_path_; scoped_ptr<Event> install_event_1_; @@ -87,8 +87,8 @@ class PerformanceMonitorDatabaseEventTest : public ::testing::Test { TEST(PerformanceMonitorDatabaseSetupTest, OpenCloseTest) { FilePath alternate_path; file_util::CreateNewTempDirectory(FilePath::StringType(), &alternate_path); - scoped_refptr<Database> db = Database::Create(alternate_path); - ASSERT_TRUE(db); + scoped_ptr<Database> db = Database::Create(alternate_path); + ASSERT_TRUE(db.get()); ASSERT_TRUE(db->Close()); } @@ -99,26 +99,26 @@ TEST(PerformanceMonitorDatabaseSetupTest, ActiveIntervalTest) { TestingClock* clock_1 = new TestingClock(); base::Time start_time = clock_1->GetTime(); - scoped_refptr<Database> db_1 = Database::Create(alternate_path); + scoped_ptr<Database> db_1 = Database::Create(alternate_path); db_1->set_clock(scoped_ptr<Database::Clock>(clock_1)); db_1->AddStateValue("test", "test"); - ASSERT_TRUE(db_1); + ASSERT_TRUE(db_1.get()); ASSERT_TRUE(db_1->Close()); TestingClock* clock_2 = new TestingClock(*clock_1); base::Time mid_time = clock_2->GetTime(); - scoped_refptr<Database> db_2 = Database::Create(alternate_path); + scoped_ptr<Database> db_2 = Database::Create(alternate_path); db_2->set_clock(scoped_ptr<Database::Clock>(clock_2)); db_2->AddStateValue("test", "test"); - ASSERT_TRUE(db_2); + ASSERT_TRUE(db_2.get()); ASSERT_TRUE(db_2->Close()); TestingClock* clock_3 = new TestingClock(*clock_2); base::Time end_time = clock_3->GetTime(); - scoped_refptr<Database> db_3 = Database::Create(alternate_path); + scoped_ptr<Database> db_3 = Database::Create(alternate_path); db_3->set_clock(scoped_ptr<Database::Clock>(clock_3)); db_3->AddStateValue("test", "test"); - ASSERT_TRUE(db_3); + ASSERT_TRUE(db_3.get()); std::vector<TimeRange> active_interval = db_3->GetActiveIntervals(start_time, end_time); |