Revert 205059 "We were seeing ActivityLog memory leaks and assor..."

trunk/src/chrome/browser/extensions/activity_log/activity_database_unittest.cc

Index: trunk/src/chrome/browser/extensions/activity_log/activity_database_unittest.cc
===================================================================
--- trunk/src/chrome/browser/extensions/activity_log/activity_database_unittest.cc	(revision 205306)
+++ trunk/src/chrome/browser/extensions/activity_log/activity_database_unittest.cc	(working copy)
@@ -77,7 +77,7 @@
 
   ActivityDatabase* activity_db = new ActivityDatabase();
   activity_db->Init(db_file);
-  ASSERT_TRUE(activity_db->is_db_valid());
+  ASSERT_TRUE(activity_db->initialized());
   activity_db->Close();
 
   sql::Connection db;
@@ -99,7 +99,7 @@
   ActivityDatabase* activity_db = new ActivityDatabase();
   activity_db->Init(db_file);
   activity_db->SetBatchModeForTesting(false);
-  ASSERT_TRUE(activity_db->is_db_valid());
+  ASSERT_TRUE(activity_db->initialized());
   scoped_refptr<APIAction> action = new APIAction(
       "punky",
       base::Time::Now(),
@@ -134,7 +134,7 @@
 
   ActivityDatabase* activity_db = new ActivityDatabase();
   activity_db->Init(db_file);
-  ASSERT_TRUE(activity_db->is_db_valid());
+  ASSERT_TRUE(activity_db->initialized());
   scoped_refptr<BlockedAction> action = new BlockedAction(
       "punky",
       base::Time::Now(),
@@ -177,7 +177,7 @@
   // Record some actions
   ActivityDatabase* activity_db = new ActivityDatabase();
   activity_db->Init(db_file);
-  ASSERT_TRUE(activity_db->is_db_valid());
+  ASSERT_TRUE(activity_db->initialized());
   scoped_refptr<APIAction> api_action = new APIAction(
       "punky",
       mock_clock.Now() - base::TimeDelta::FromMinutes(40),
@@ -237,7 +237,7 @@
   // Record some actions
   ActivityDatabase* activity_db = new ActivityDatabase();
   activity_db->Init(db_file);
-  ASSERT_TRUE(activity_db->is_db_valid());
+  ASSERT_TRUE(activity_db->initialized());
   scoped_refptr<APIAction> api_action = new APIAction(
       "punky",
       mock_clock.Now() - base::TimeDelta::FromDays(3)
@@ -309,7 +309,7 @@
   activity_db->Init(db_file);
   activity_db->SetBatchModeForTesting(false);
   activity_db->SetClockForTesting(&mock_clock);
-  ASSERT_TRUE(activity_db->is_db_valid());
+  ASSERT_TRUE(activity_db->initialized());
   scoped_refptr<APIAction> api_action = new APIAction(
       "punky",
       mock_clock.Now() - base::TimeDelta::FromMinutes(40),
@@ -343,7 +343,7 @@
   activity_db->Init(db_file);
   activity_db->SetBatchModeForTesting(true);
   activity_db->SetClockForTesting(&mock_clock);
-  ASSERT_TRUE(activity_db->is_db_valid());
+  ASSERT_TRUE(activity_db->initialized());
   scoped_refptr<APIAction> api_action = new APIAction(
       "punky",
       mock_clock.Now() - base::TimeDelta::FromMinutes(40),
@@ -388,5 +388,5 @@
   activity_db->Close();
 }
 
-}  // namespace extensions
+}  // namespace