Improve merging of header modifications in webRequest.OnHeadersReceived

chrome/browser/extensions/extension_webrequest_api.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBREQUEST_API_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBREQUEST_API_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #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"
 #include "net/base/completion_callback.h"
 #include "net/base/network_delegate.h"
 #include "net/http/http_request_headers.h"
 #include "webkit/glue/resource_type.h"
 
 class ExtensionInfoMap;
 class ExtensionWebRequestTimeTracker;
 class GURL;
 class RenderProcessHost;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 class StringValue;
 }
 
-namespace extension_webrequest_api_helpers {
-struct EventResponseDelta;
-}
-
 namespace net {
 class AuthCredentials;
 class AuthChallengeInfo;
 class HostPortPair;
 class HttpRequestHeaders;
 class HttpResponseHeaders;
 class URLRequest;
 }
 
 // This class observes network events and routes them to the appropriate
@@ skipping 55 matching lines @@
 
     // The time that the extension was installed. Used for deciding order of
     // precedence in case multiple extensions respond with conflicting
     // decisions.
     base::Time extension_install_time;
 
     // Response values. These are mutually exclusive.
     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,
                   const base::Time& extension_install_time);
     ~EventResponse();
 
     DISALLOW_COPY_AND_ASSIGN(EventResponse);
   };
 
   static ExtensionWebRequestEventRouter* GetInstance();
@@ skipping 240 matching lines @@
   // function.
   virtual void OnQuotaExceeded() OVERRIDE;
 };
 
 // Send updates to |host| with information about what webRequest-related
 // extensions are installed.
 // TODO(mpcomplete): remove. http://crbug.com/100411
 void SendExtensionWebRequestStatusToHost(RenderProcessHost* host);
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBREQUEST_API_H_