Extension activity log database refactoring (step 1)

chrome/browser/extensions/activity_log/fullstream_ui_policy.cc

 // Copyright 2013 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 "base/files/file_path.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/extensions/activity_log/activity_database.h"
 #include "chrome/browser/extensions/activity_log/api_actions.h"
@@ skipping 25 matching lines @@
 
 namespace extensions {
 
 // TODO(dbabic) This would be a fine error handler for all sql-based policies,
 // so it would make sense to introduce another class in the hierarchy,
 // SQLiteBasedPolicy as a super class of FullStreamUIPolicy and move this
 // error handler (as well as other SQLite-related functionality) there.
 
 FullStreamUIPolicy::FullStreamUIPolicy(Profile* profile)
     : ActivityLogPolicy(profile) {
-  db_ = new ActivityDatabase();
+  db_ = new ActivityDatabase(this);
   FilePath database_name = profile_base_path_.Append(
       chrome::kExtensionActivityLogFilename);
   ScheduleAndForget(db_, &ActivityDatabase::Init, database_name);
 }
 
-FullStreamUIPolicy::~FullStreamUIPolicy() {
+bool FullStreamUIPolicy::DatabaseInitCallback(sql::Connection* db) {
+  // Create the DOMAction database.

[Matt Perry, 2013/07/10 23:19:30]

nit: these comments are redundant

[mvrable, 2013/07/11 17:30:33]

Deleted, though all this code will be gone soon in one of the later refactoring
patches.

+  if (!DOMAction::InitializeTable(db))
+    return false;
+
+  // Create the APIAction database.
+  if (!APIAction::InitializeTable(db))
+    return false;
+
+  // Create the BlockedAction database.
+  if (!BlockedAction::InitializeTable(db))
+    return false;
+
+  return true;
+}
+
+void FullStreamUIPolicy::DatabaseCloseCallback() {
+  delete this;
+}
+
+void FullStreamUIPolicy::Close() {
   // The policy object should have never been created if there's no DB thread.
   DCHECK(BrowserThread::IsMessageLoopValid(BrowserThread::DB));
   ScheduleAndForget(db_, &ActivityDatabase::Close);
 }
 
 // Get data as a set of key-value pairs.  The keys are policy-specific.
 void FullStreamUIPolicy::ReadData(
     const std::string& extension_id,
     const int day,
     const Callback
         <void(scoped_ptr<std::vector<scoped_refptr<Action> > >)>& callback)
     const {
   BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::DB,
       FROM_HERE,
       base::Bind(&ActivityDatabase::GetActions, Unretained(db_),
                  extension_id, day),
       callback);
 }
 
-void FullStreamUIPolicy::SetSaveStateOnRequestOnly() {
-  ScheduleAndForget(db_, &ActivityDatabase::SetBatchModeForTesting, false);
-  ActivityLogPolicy::SetSaveStateOnRequestOnly();
-}
-
 std::string FullStreamUIPolicy::GetKey(ActivityLogPolicy::KeyType key_ty) const
 {
   switch (key_ty) {
     case PARAM_KEY_REASON:
       return std::string(kKeyReason);
     case PARAM_KEY_DOM_ACTION:
       return std::string(kKeyDomainAction);
     case PARAM_KEY_URL_TITLE:
       return std::string(kKeyURLTitle);
     case PARAM_KEY_DETAILS_STRING:
@@ skipping 125 matching lines @@
       break;
     }
     default:
       NOTREACHED();
   }
 
   ScheduleAndForget(db_, &ActivityDatabase::RecordAction, action);
 }
 
 }  // namespace extensions