Extension activity log database refactoring (step 1)

chrome/browser/extensions/activity_log/activity_log_policy.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_POLICY_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_POLICY_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 54 matching lines @@
     PARAM_KEY_URL_TITLE,
     PARAM_KEY_DETAILS_STRING,
     PARAM_KEY_EXTRA,
   };
 
   // Parameters are the profile and the thread that will be used to execute
   // the callback when ReadData is called.
   // TODO(felt,dbabic)  Since only ReadData uses thread_id, it would be
   // cleaner to pass thread_id as a param of ReadData directly.
   explicit ActivityLogPolicy(Profile* profile);
-  virtual ~ActivityLogPolicy();
+
+  virtual void Close() = 0;
 
   // Updates the internal state of the model summarizing actions and possibly
   // writes to the database.  Implements the default policy storing internal
   // state to memory every 5 min.
   virtual void ProcessAction(
       ActionType action_type,
       const std::string& extension_id,
       const std::string& name,                    // action name
       const GURL& gurl,                           // target URL
       const base::ListValue* args,                // arguments
@@ skipping 22 matching lines @@
           <void(scoped_ptr<std::vector<scoped_refptr<Action> > >)>& callback)
       const {}
 
   // For testing purposes --- disables periodic state saving, making the
   // behavior reproducible.
   virtual void SetSaveStateOnRequestOnly();
 
   virtual std::string GetKey(KeyType key_id) const;
 
  protected:
+  // An ActivityLogPolicy is not directly destroyed.  Instead, call Close()
+  // which will cause the object to be deleted when it is safe.
+  virtual ~ActivityLogPolicy();
+
   // The Schedule methods dispatch the calls to the database on a
   // separate thread. We dispatch to the UI thread if the DB thread doesn't
   // exist, which should only happen in tests where there is no DB thread.
   template<typename DatabaseType, typename DatabaseFunc>
   void ScheduleAndForget(DatabaseType db, DatabaseFunc func) {
     content::BrowserThread::PostTask(
         content::BrowserThread::DB,
         FROM_HERE,
         base::Bind(func, base::Unretained(db)));
   }
@@ skipping 10 matching lines @@
       typename ArgA, typename ArgB>
   void ScheduleAndForget(DatabaseType db, DatabaseFunc func, ArgA a, ArgB b) {
     content::BrowserThread::PostTask(
         content::BrowserThread::DB,
         FROM_HERE,
         base::Bind(func, base::Unretained(db), a, b));
   }
 
   base::FilePath profile_base_path_;
   base::RepeatingTimer<ActivityLogPolicy> timer_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ActivityLogPolicy);

[felt, 2013/07/09 22:14:51]

yikes. is this missing in other policy files too?

[mvrable, 2013/07/09 23:03:22]

Yes, it was missing in the ActivityLogPolicy subclasses too. 
DISALLOW_COPY_AND_ASSIGN is inherited, but I can add it to the subclasses for
clarity if you'd like.

[felt, 2013/07/10 00:14:36]

If it's inherited, then nevermind. Thanks for catching it.

 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_POLICY_H_