Add ApiActivityMonitor to decouple ActivityLog from low-level extensions code

chrome/browser/extensions/activity_log/activity_log.cc

 // Copyright (c) 2011 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 "chrome/browser/extensions/activity_log/activity_log.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/extensions/activity_log/activity_action_constants.h"
 #include "chrome/browser/extensions/activity_log/counting_policy.h"
 #include "chrome/browser/extensions/activity_log/fullstream_ui_policy.h"
 #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
+#include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/extension.h"
 #include "third_party/re2/re2/re2.h"
 #include "url/gurl.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/extensions/activity_log/uma_policy.h"
 #endif
 
 namespace constants = activity_log_constants;
 
 namespace {
 
 using extensions::Action;
 using constants::kArgUrlPlaceholder;
+using content::BrowserThread;
 
 // If DOM API methods start with this string, we flag them as being of type
 // DomActionType::XHR.
 const char kDomXhrPrefix[] = "XMLHttpRequest.";
 
 // Specifies a possible action to take to get an extracted URL in the ApiInfo
 // structure below.
 enum Transformation {
   NONE,
   DICT_LOOKUP,
@@ skipping 327 matching lines @@
 
   db_enabled_ = has_threads_
       && (CommandLine::ForCurrentProcess()->
           HasSwitch(switches::kEnableExtensionActivityLogging)
       || watchdog_apps_active_);
 
   ExtensionSystem::Get(profile_)->ready().Post(
       FROM_HERE,
       base::Bind(&ActivityLog::InitInstallTracker, base::Unretained(this)));
 
-  EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
-  if (event_router)
-    event_router->SetEventDispatchObserver(this);
-
 // None of this should run on Android since the AL is behind ENABLE_EXTENSION
 // checks. However, UmaPolicy can't even compile on Android because it uses
 // BrowserList and related classes that aren't compiled for Android.
 #if !defined(OS_ANDROID)
   if (!profile->IsOffTheRecord())
     uma_policy_ = new UmaPolicy(profile_);
 #endif
 
   ChooseDatabasePolicy();
 }
@@ skipping 200 matching lines @@
       for (std::set<std::string>::const_iterator it2 = it->second.begin();
            it2 != it->second.end();
            ++it2) {
         action->mutable_args()->AppendString(*it2);
       }
       LogAction(action);
     }
   }
 }
 
-void ActivityLog::OnWillDispatchEvent(scoped_ptr<EventDispatchInfo> details) {
-  scoped_refptr<Action> action = new Action(details->extension_id,
+void ActivityLog::OnApiEventDispatched(const std::string& extension_id,
+                                       const std::string& event_name,
+                                       scoped_ptr<base::ListValue> event_args) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  scoped_refptr<Action> action = new Action(extension_id,
                                             base::Time::Now(),
                                             Action::ACTION_API_EVENT,
-                                            details->event_name);
-  action->set_args(details->event_args.Pass());
+                                            event_name);
+  action->set_args(event_args.Pass());
   LogAction(action);
 }
 
+void ActivityLog::OnApiFunctionCalled(const std::string& extension_id,
+                                      const std::string& api_name,
+                                      scoped_ptr<base::ListValue> args) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  scoped_refptr<Action> action = new Action(extension_id,
+                                            base::Time::Now(),
+                                            Action::ACTION_API_CALL,
+                                            api_name);
+  action->set_args(args.Pass());
+  LogAction(action);
+}
+
 // LOOKUP ACTIONS. -------------------------------------------------------------
 
 void ActivityLog::GetFilteredActions(
     const std::string& extension_id,
     const Action::ActionType type,
     const std::string& api_name,
     const std::string& page_url,
     const std::string& arg_url,
     const int daysAgo,
     const base::Callback
@@ skipping 32 matching lines @@
   RemoveURLs(urls);
 }
 
 void ActivityLog::DeleteDatabase() {
   if (!database_policy_)
     return;
   database_policy_->DeleteDatabase();
 }
 
 }  // namespace extensions