Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / activity_log / activity_log.h

diff --git a/src/chrome/browser/extensions/activity_log/activity_log.h b/src/chrome/browser/extensions/activity_log/activity_log.h
index a959d2b..6cecf7d 100644 (file)
--- a/src/chrome/browser/extensions/activity_log/activity_log.h
+++ b/src/chrome/browser/extensions/activity_log/activity_log.h
@@ -17,9 +17,9 @@
 #include "chrome/browser/extensions/activity_log/activity_log_policy.h"
 #include "chrome/browser/extensions/install_observer.h"
 #include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/common/extensions/dom_action_types.h"
 #include "extensions/browser/api_activity_monitor.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
+#include "extensions/common/dom_action_types.h"
 
 class Profile;
 
@@ -117,10 +117,13 @@ class ActivityLog : public BrowserContextKeyedAPI,
   // Deletes the database associated with the policy that's currently in use.
   void DeleteDatabase();
 
+  // If we're in a browser test, we need to pretend that the watchdog app is
+  // active.
+  void SetWatchdogAppActiveForTesting(bool active);
+
  private:
   friend class ActivityLogTest;
   friend class BrowserContextKeyedAPIFactory<ActivityLog>;
-  friend class RenderViewActivityLogTest;
 
   explicit ActivityLog(content::BrowserContext* context);
   virtual ~ActivityLog();
@@ -128,9 +131,6 @@ class ActivityLog : public BrowserContextKeyedAPI,
   // 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();
-  // If we're in a browser test, we need to pretend that the watchdog app is
-  // active.
-  void SetWatchdogAppActive(bool active);
 
   // 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