Improve merging of header modifications in webRequest.OnHeadersReceived

chrome/browser/extensions/extension_webrequest_apitest.cc

Index: chrome/browser/extensions/extension_webrequest_apitest.cc
diff --git a/chrome/browser/extensions/extension_webrequest_apitest.cc b/chrome/browser/extensions/extension_webrequest_apitest.cc
index 82b0d7fe528db8d68dfbc210d674dfcbd256b3ed..6a9a1657a46b78d60be36ec25e5a9819535d4325 100644
--- a/chrome/browser/extensions/extension_webrequest_apitest.cc
+++ b/chrome/browser/extensions/extension_webrequest_apitest.cc
@@ -72,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestSimple) {
 }
 
 // Broken, http://crbug.com/101651
-IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, DISABLED_WebRequestComplex) {
+IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, /*DISABLED_*/WebRequestComplex) {

[battre, 2011/11/11 15:01:57]

I will revert this before committing.

   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
@@ -92,7 +92,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestAuthRequired) {
 
 // Hangs flakily: http://crbug.com/91715
 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest,
-                       DISABLED_WebRequestBlocking) {
+                       /*DISABLED_*/WebRequestBlocking) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);