[Extensions] Fix incorrect counting prefs in activity log

chrome/browser/extensions/activity_log/activity_log.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 21 matching lines @@
 class BrowserContext;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace extensions {
 class Extension;
 class ExtensionRegistry;
+class ExtensionSystem;
 
 // A utility for tracing interesting activity for each extension.
 // It writes to an ActivityDatabase on a separate thread to record the activity.
 // Each profile has different extensions, so we keep a different database for
 // each profile.
 //
 class ActivityLog : public BrowserContextKeyedAPI,
                     public ScriptExecutionObserver,
                     public ExtensionRegistryObserver,
                     public content::NotificationObserver {
@@ skipping 81 matching lines @@
 
   // Specifies if the Watchdog app is active (installed & enabled).
   // If so, we need to log to the database and stream to the API.
   bool IsWatchdogAppActive();
 
   // Specifies if we need to record actions to the db. If so, we need to log to
   // the database. This is true if the Watchdog app is active *or* the
   // --enable-extension-activity-logging flag is set.
   bool IsDatabaseEnabled();
 
+  // Updates cached_consumer_count_ to be active_consumers_ and stores the value
+  // in prefs.
+  void UpdateCachedConsumerCount();
+
   // ScriptExecutionObserver implementation.
   // Fires when a ContentScript is executed.
   void OnScriptsExecuted(const content::WebContents* web_contents,
                          const ExecutingScriptsMap& extension_ids,
                          const GURL& on_url) override;
 
   // At the moment, ActivityLog will use only one policy for summarization.
   // These methods are used to choose and set the most appropriate policy.
   // Changing policies at runtime is not recommended, and likely only should be
   // done for unit tests.
   void ChooseDatabasePolicy();
   void SetDatabasePolicy(ActivityLogPolicy::PolicyType policy_type);
 
   // Checks the current |is_active_| state and modifies it if appropriate.
-  void CheckActive();
+  // If |use_cached| is true, then this checks the cached_consumer_count_ for
+  // whether or not a consumer is active. Otherwise, checks active_consumers_.
+  void CheckActive(bool use_cached);
 
   // content::NotificationObserver:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
+  // Called once the ExtensionSystem is ready.
+  void OnExtensionSystemReady();
+
   // BrowserContextKeyedAPI implementation.
   static const char* service_name() { return "ActivityLog"; }
   static const bool kServiceRedirectedInIncognito = true;
   static const bool kServiceIsCreatedWithBrowserContext = false;
 
   typedef base::ObserverListThreadSafe<Observer> ObserverList;
   scoped_refptr<ObserverList> observers_;
 
   // Policy objects are owned by the ActivityLog, but cannot be scoped_ptrs
   // since they may need to do some cleanup work on the database thread.
   // Calling policy->Close() will free the object; see the comments on the
   // ActivityDatabase class for full details.
 
   // The database policy object takes care of recording & looking up data:
   // data summarization, compression, and logging. There should only be a
   // database_policy_ if the Watchdog app is installed or flag is set.
   ActivityLogDatabasePolicy* database_policy_;
   ActivityLogPolicy::PolicyType database_policy_type_;
 
   Profile* profile_;
+
+  ExtensionSystem* extension_system_;
+
   bool db_enabled_;  // Whether logging to disk is currently enabled.
   // testing_mode_ controls which policy is selected.
   // * By default, we choose a policy that doesn't log most arguments to avoid
   // saving too much data. We also elide some arguments for privacy reasons.
   // * In testing mode, we choose a policy that logs all arguments.
   // testing_mode_ also causes us to print to the console.
   bool testing_mode_;
   // We need the DB, FILE, and IO threads to write to the database.
   // In some cases (tests), these threads might not exist, so we avoid
   // dispatching anything to the policies/database to prevent things from
   // exploding.
   bool has_threads_;
 
   // Used to track whether the whitelisted extension is installed. If it's
   // added or removed, enabled_ may change.
   ScopedObserver<extensions::ExtensionRegistry,
                  extensions::ExtensionRegistryObserver>
       extension_registry_observer_;
 
-  // Set if the watchdog app is installed and enabled. Maintained by
-  // kWatchdogExtensionActive pref variable. Since there are multiple valid
-  // extension IDs, this needs to be an int to count how many are installed.
-  int watchdog_apps_active_;
+  // The number of active consumers of the activity log.
+  int active_consumers_;
+
+  // The cached number of consumers of the activity log. Maintained by the
+  // kWatchdogExtensionActive pref variable, and updated on startup. We cache
+  // the result so that we can record extension actions that happen before
+  // all extensions have finished loading.
+  int cached_consumer_count_;
 
   // True if the activity log is currently active, meaning that the user has
   // either added the commandline switch or has loaded a compatible extension.
   // While inactive, the activity log will not store any actions for performance
   // reasons.
   bool is_active_;
 
   content::NotificationRegistrar registrar_;
 
+  base::WeakPtrFactory<ActivityLog> weak_factory_;
+
   FRIEND_TEST_ALL_PREFIXES(ActivityLogApiTest, TriggerEvent);
   FRIEND_TEST_ALL_PREFIXES(ActivityLogEnabledTest, AppAndCommandLine);
   FRIEND_TEST_ALL_PREFIXES(ActivityLogEnabledTest, CommandLineSwitch);
   FRIEND_TEST_ALL_PREFIXES(ActivityLogEnabledTest, NoSwitch);
   FRIEND_TEST_ALL_PREFIXES(ActivityLogEnabledTest, PrefSwitch);
   FRIEND_TEST_ALL_PREFIXES(ActivityLogEnabledTest, WatchdogSwitch);
   DISALLOW_COPY_AND_ASSIGN(ActivityLog);
 };
 
 template <>
 void BrowserContextKeyedAPIFactory<ActivityLog>::DeclareFactoryDependencies();
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_H_