Improved extension activity logging for the chrome.webRequest API.

chrome/test/data/extensions/activity_log/options.js

Index: chrome/test/data/extensions/activity_log/options.js
diff --git a/chrome/test/data/extensions/activity_log/options.js b/chrome/test/data/extensions/activity_log/options.js
index 1298b303ffc8955c9def15dab8f904dbcc1ee5d3..8498e711ac951ba56cbcd48ea0aaf018c9ef767a 100644
--- a/chrome/test/data/extensions/activity_log/options.js
+++ b/chrome/test/data/extensions/activity_log/options.js
@@ -156,18 +156,38 @@ function doWebRequestModifications() {
   // Install a webRequest handler that will add an HTTP header to the outgoing
   // request for the main page.
   function doModifyHeaders(details) {
+    var response = {};
+
     var headers = details.requestHeaders;
     if (headers === undefined) {
       headers = [];
     }
     headers.push({'name': 'X-Test-Activity-Log-Send',
                   'value': 'Present'});
-    return {'requestHeaders': headers};
+    response['requestHeaders'] = headers;
+
+    headers = details.responseHeaders;
+    if (headers === undefined) {
+      headers = [];
+    }
+    headers = headers.filter(
+        function(x) {return x["name"] != "Cache-Control"});
+    headers.push({'name': 'X-Test-Response-Header',
+                  'value': 'Inserted'});
+    headers.push({'name': 'Set-Cookie',
+                  'value': 'ActivityLog=InsertedCookie'});
+    response['responseHeaders'] = headers;
+
+    return response;
   }
   chrome.webRequest.onBeforeSendHeaders.addListener(
       doModifyHeaders,
       {'urls': ['http://*/*'], 'types': ['main_frame']},
       ['blocking', 'requestHeaders']);
+  chrome.webRequest.onHeadersReceived.addListener(
+      doModifyHeaders,
+      {'urls': ['http://*/*'], 'types': ['main_frame']},
+      ['blocking', 'responseHeaders']);
 
   // Open a tab, then close it when it has finished loading--this should give
   // the webRequest handler a chance to run.