Chromeframe user-agent without need of HttpNegotiate patch.

chrome_frame/bho.cc

 // Copyright (c) 2009 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.
 
 #include "chrome_frame/bho.h"
 
 #include <shlguid.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 324 matching lines @@
   bool ret = false;
 
   _pAtlModule->m_csStaticDataInitAndTypeInfo.Lock();
 
   if (state_ == UNKNOWN) {
     // If we're going to start patching things for reals, we'd better make sure
     // that we stick around for ever more:
     if (!IsUnpinnedMode())
       PinModule();
 
-    HttpNegotiatePatch::Initialize();
-
     ProtocolPatchMethod patch_method = GetPatchMethod();
     if (patch_method == PATCH_METHOD_INET_PROTOCOL) {
       g_trans_hooks.InstallHooks();
       state_ = PATCH_PROTOCOL;
     } else if (patch_method == PATCH_METHOD_IBROWSER) {
+      HttpNegotiatePatch::Initialize();
       state_ =  PATCH_IBROWSER;
     } else {
       DCHECK(patch_method == PATCH_METHOD_MONIKER);
       state_ = PATCH_MONIKER;
+      HttpNegotiatePatch::Initialize();
       MonikerPatch::Initialize();
     }
 
     ret = true;
   }
 
   _pAtlModule->m_csStaticDataInitAndTypeInfo.Unlock();
 
   return ret;
 }
 
 void PatchHelper::PatchBrowserService(IBrowserService* browser_service) {
   DCHECK(state_ == PATCH_IBROWSER);
   if (!IS_PATCHED(IBrowserService)) {
     vtable_patch::PatchInterfaceMethods(browser_service,
                                         IBrowserService_PatchInfo);
   }
 }
 
 void PatchHelper::UnpatchIfNeeded() {
   if (state_ == PATCH_PROTOCOL) {
     g_trans_hooks.RevertHooks();
   } else if (state_ == PATCH_IBROWSER) {
     vtable_patch::UnpatchInterfaceMethods(IBrowserService_PatchInfo);
     MonikerPatch::Uninitialize();
+    HttpNegotiatePatch::Uninitialize();
+  } else {
+    HttpNegotiatePatch::Uninitialize();
   }
 
-  HttpNegotiatePatch::Uninitialize();
-
   state_ = UNKNOWN;
 }