Improved extension activity logging for the chrome.webRequest API.

chrome/browser/extensions/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.h"
 
 #include <set>
 #include <vector>
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 338 matching lines @@
   if (!IsLogEnabled()) return;
   LogDOMActionInternal(extension,
                        url,
                        url_title,
                        api_call,
                        args,
                        extra,
                        DOMAction::MODIFIED);
 }
 
+void ActivityLog::LogWebRequestAction(const Extension* extension,
+                                      const GURL& url,
+                                      const std::string& api_call,
+                                      scoped_ptr<DictionaryValue> details,
+                                      const std::string& extra) {
+  string16 null_title;
+  if (!IsLogEnabled()) return;
+
+  // Strip details of the web request modifications (for privacy reasons),
+  // unless testing is enabled.
+  if (!testing_mode_) {
+    DictionaryValue::Iterator details_iterator(*details);
+    while (!details_iterator.IsAtEnd()) {
+      details->SetBoolean(details_iterator.key(), true);
+      details_iterator.Advance();
+    }
+  }
+  std::string details_string;
+  JSONStringValueSerializer serializer(&details_string);
+  serializer.SerializeAndOmitBinaryValues(*details);
+
+  scoped_refptr<DOMAction> action = new DOMAction(
+      extension->id(),
+      base::Time::Now(),
+      DOMAction::WEBREQUEST,
+      url,
+      null_title,
+      api_call,
+      details_string,
+      extra);
+  ScheduleAndForget(&ActivityDatabase::RecordAction, action);
+
+  // Display the action.
+  ObserverMap::const_iterator iter = observers_.find(extension);
+  if (iter != observers_.end()) {
+    iter->second->Notify(&Observer::OnExtensionActivity,
+                         extension,
+                         ActivityLog::ACTIVITY_CONTENT_SCRIPT,
+                         action->PrettyPrintForDebug());
+  }
+  if (log_activity_to_stdout_)
+    LOG(INFO) << action->PrettyPrintForDebug();
+}
+
 void ActivityLog::GetActions(
     const std::string& extension_id,
     const int day,
     const base::Callback
         <void(scoped_ptr<std::vector<scoped_refptr<Action> > >)>& callback) {
   if (!db_) return;
   BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::DB,
       FROM_HERE,
       base::Bind(&ActivityDatabase::GetActions,
@@ skipping 62 matching lines @@
       return "content_script";
     case ActivityLog::ACTIVITY_EVENT_DISPATCH:
       return "event_dispatch";
     default:
       NOTREACHED();
       return "";
   }
 }
 
 }  // namespace extensions