Fix onBeforeSendHeaders regression: we were sending {name: name} for every

header value pair.

BUG=82137
TEST=no

Review URL: http://codereview.chromium.org/7048010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86308 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_webrequest_api.cc

@@ -161,7 +161,7 @@ ListValue* GetRequestHeadersList(const net::HttpRequestHeaders* headers) {
     for (net::HttpRequestHeaders::Iterator it(*headers); it.GetNext(); ) {
       DictionaryValue* header = new DictionaryValue();
       header->SetString(keys::kHeaderNameKey, it.name());
-      header->SetString(keys::kHeaderValueKey, it.name());
+      header->SetString(keys::kHeaderValueKey, it.value());
       headers_value->Append(header);
     }
   }

chrome/test/data/extensions/api_test/webrequest/events/test.html

@@ -104,6 +104,16 @@ function checkExpectations() {
   eventsCaptured();
 }
 
+// Simple check to see that we have a User-Agent header, and that it contains
+// an expected value. This is a basic check that the request headers are valid.
+function checkUserAgent(headers) {
+  for (var i in headers) {
+    if (headers[i].name.toLowerCase() == "user-agent")
+      return headers[i].value.toLowerCase().indexOf("chrome") != -1;
+  }
+  return false;
+}
+
 function captureEvent(name, details) {
   // Ignore system-level requests like safebrowsing updates and favicon fetches
   // since they are unpredictable.
@@ -123,7 +133,7 @@ function captureEvent(name, details) {
   delete details.requestId;
   delete details.timeStamp;
   if (details.requestHeaders) {
-    details.requestHeadersExist = true;
+    details.requestHeadersValid = checkUserAgent(details.requestHeaders);
     delete details.requestHeaders;
   }
   if (details.responseHeaders) {
@@ -263,7 +273,7 @@ runTests([
           event: "onBeforeSendHeaders",
           details: {
             url: URL_HTTP_SIMPLE_LOAD_REDIRECT,
-            requestHeadersExist: true
+            requestHeadersValid: true
           }
         },
         { label: "onRequestSent-1",
@@ -271,7 +281,7 @@ runTests([
           details: {
             url: URL_HTTP_SIMPLE_LOAD_REDIRECT,
             ip: "127.0.0.1",
-            requestHeadersExist: true
+            requestHeadersValid: true
           }
         },
         { label: "onBeforeRedirect",
@@ -297,7 +307,7 @@ runTests([
           event: "onBeforeSendHeaders",
           details: {
             url: URL_HTTP_SIMPLE_LOAD,
-            requestHeadersExist: true
+            requestHeadersValid: true
           }
         },
         { label: "onRequestSent-2",
@@ -305,7 +315,7 @@ runTests([
           details: {
             url: URL_HTTP_SIMPLE_LOAD,
             ip: "127.0.0.1",
-            requestHeadersExist: true
+            requestHeadersValid: true
           }
         },
         { label: "onResponseStarted",