Improve merging of header modifications in webRequest.OnHeadersReceived

chrome/browser/extensions/extension_webrequest_api.h

Index: chrome/browser/extensions/extension_webrequest_api.h
diff --git a/chrome/browser/extensions/extension_webrequest_api.h b/chrome/browser/extensions/extension_webrequest_api.h
index 8e28f4191df023433c6f8ee77d9af3258a6cffe4..28a51470b2f58c36d2632e207ac67ffc4f0048f8 100644
--- a/chrome/browser/extensions/extension_webrequest_api.h
+++ b/chrome/browser/extensions/extension_webrequest_api.h
@@ -15,6 +15,7 @@
 #include "base/memory/singleton.h"
 #include "base/time.h"
 #include "chrome/browser/extensions/extension_function.h"
+#include "chrome/browser/extensions/extension_webrequest_api_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/url_pattern_set.h"
 #include "ipc/ipc_message.h"
@@ -31,6 +32,7 @@ class RenderProcessHost;
 namespace base {
 class DictionaryValue;
 class ListValue;
+class StringValue;
 }
 
 namespace net {
@@ -107,8 +109,9 @@ class ExtensionWebRequestEventRouter {
     bool cancel;
     GURL new_url;
     scoped_ptr<net::HttpRequestHeaders> request_headers;
-    // Contains all header lines after the status line, lines are \n separated.
-    std::string response_headers_string;
+    scoped_ptr<extension_webrequest_api_helpers::ResponseHeaders>
+        response_headers;
+
     scoped_ptr<net::AuthCredentials> auth_credentials;
 
     EventResponse(const std::string& extension_id,