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

trunk/src/chrome/browser/extensions/activity_log/activity_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 <string>
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
@@ skipping 59 matching lines @@
 // Check that the database is initialized properly.
 TEST_F(ActivityDatabaseTest, Init) {
   base::ScopedTempDir temp_dir;
   base::FilePath db_file;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   db_file = temp_dir.path().AppendASCII("ActivityInit.db");
   file_util::Delete(db_file, false);
 
   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;
   ASSERT_TRUE(db.Open(db_file));
   ASSERT_TRUE(db.DoesTableExist(DOMAction::kTableName));
   ASSERT_TRUE(db.DoesTableExist(APIAction::kTableName));
   ASSERT_TRUE(db.DoesTableExist(BlockedAction::kTableName));
   db.Close();
 }
 
 // Check that API actions are recorded in the db.
 TEST_F(ActivityDatabaseTest, RecordAPIAction) {
   base::ScopedTempDir temp_dir;
   base::FilePath db_file;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
   file_util::Delete(db_file, false);
 
   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(),
       APIAction::CALL,
       "brewster",
       "woof",
       "extra");
   activity_db->RecordAction(action);
   activity_db->Close();
 
@@ skipping 14 matching lines @@
 // Check that blocked actions are recorded in the db.
 TEST_F(ActivityDatabaseTest, RecordBlockedAction) {
   base::ScopedTempDir temp_dir;
   base::FilePath db_file;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
   file_util::Delete(db_file, false);
 
   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(),
       "do.evilThings",
       "1, 2",
       BlockedAction::ACCESS_DENIED,
       "extra");
   activity_db->RecordAction(action);
   activity_db->Close();
 
@@ skipping 22 matching lines @@
 
   // Use a mock clock to ensure that events are not recorded on the wrong day
   // when the test is run close to local midnight.
   base::SimpleTestClock mock_clock;
   mock_clock.SetNow(base::Time::Now().LocalMidnight() +
                     base::TimeDelta::FromHours(12));
 
   // 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),
       APIAction::CALL,
       "brewster",
       "woof",
       "extra");
   scoped_refptr<DOMAction> dom_action = new DOMAction(
       "punky",
       mock_clock.Now(),
@@ skipping 39 matching lines @@
 
   // Use a mock clock to ensure that events are not recorded on the wrong day
   // when the test is run close to local midnight.
   base::SimpleTestClock mock_clock;
   mock_clock.SetNow(base::Time::Now().LocalMidnight() +
                     base::TimeDelta::FromHours(12));
 
   // 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)
           - base::TimeDelta::FromMinutes(40),
       APIAction::CALL,
       "brewster",
       "woof",
       "extra");
   scoped_refptr<DOMAction> dom_action = new DOMAction(
       "punky",
@@ skipping 51 matching lines @@
   // when the test is run close to local midnight.
   base::SimpleTestClock mock_clock;
   mock_clock.SetNow(base::Time::Now().LocalMidnight() +
                     base::TimeDelta::FromHours(12));
 
   // Record some actions
   ActivityDatabase* activity_db = new ActivityDatabase();
   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),
       APIAction::CALL,
       "brewster",
       "woof",
       "extra");
   activity_db->RecordAction(api_action);
 
   scoped_ptr<std::vector<scoped_refptr<Action> > > actions =
@@ skipping 13 matching lines @@
   // timing and skip ahead in time.
   base::SimpleTestClock mock_clock;
   mock_clock.SetNow(base::Time::Now().LocalMidnight() +
                     base::TimeDelta::FromHours(11));
 
   // Record some actions
   ActivityDatabase* activity_db = new ActivityDatabase();
   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),
       APIAction::CALL,
       "brewster",
       "woof",
       "extra");
   activity_db->RecordAction(api_action);
 
   scoped_ptr<std::vector<scoped_refptr<Action> > > actions_before =
@@ skipping 24 matching lines @@
       "punky",
       base::Time::Now(),
       APIAction::CALL,
       "brewster",
       "woooof",
       "extra");
   activity_db->RecordAction(action);
   activity_db->Close();
 }
 
-}  // namespace extensions
+}  // namespace