Merge 80497 - A change in the way User Agent is modified caused Chrome Frame to mistakenly disabl...

chrome_frame/http_negotiate.cc

Index: chrome_frame/http_negotiate.cc
===================================================================
--- chrome_frame/http_negotiate.cc	(revision 80663)
+++ chrome_frame/http_negotiate.cc	(working copy)
@@ -243,6 +243,9 @@
         *additional_headers,
         (updated_headers.length() + 1) * sizeof(wchar_t)));
     lstrcpyW(*additional_headers, ASCIIToWide(updated_headers).c_str());
+  } else {
+    // TODO(erikwright): Remove the user agent if it is present (i.e., because
+    // of PostPlatform setting in the registry).
   }
   return S_OK;
 }