Revert 195265 "Improved extension activity logging for the chrom..."

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

 // Copyright (c) 2013 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.
 
 /**
   * Every test needs:
   *   - a button in options.html
   *   - a function that runs the test & calls setCompleted when done
   *   - a listener registered in setupEvents
 **/
@@ skipping 138 matching lines @@
   );
   window.open('http://www.google.cn');
 }
 
 // Modifies the headers sent and received in an HTTP request using the
 // webRequest API.
 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'});
-    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;
+    return {'requestHeaders': headers};
   }
   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.
   chrome.tabs.onUpdated.addListener(
     function closeTab(tabId, changeInfo, tab) {
       if (changeInfo['status'] === "complete" &&
           tab.url.match(/google\.co\.uk/g)) {
         chrome.webRequest.onBeforeSendHeaders.removeListener(doModifyHeaders);
         chrome.tabs.onUpdated.removeListener(closeTab);
         chrome.tabs.remove(tabId);
@@ skipping 79 matching lines @@
   $('message_self').addEventListener('click', sendMessageToSelf);
   $('message_other').addEventListener('click', sendMessageToOther);
   $('connect_other').addEventListener('click', connectToOther);
 
   completed = 0;
   total = document.getElementsByTagName('button').length;
 }
 
 document.addEventListener('DOMContentLoaded', setupEvents);