Fix a bug where in having ChromeFrame installed on the machine would cause a non chrome frame

email site to automatically logout after logging in. ChromeFrame appends the chromeframe string
to the user agent to outgoing requests initiated from IE. However this was only done in the
protocol sink patch for top level requests. Sub requests would carry the IE user agent which
in this case would cause the web server to get confused and drop the connection.

Fix is to resurrent the IHttpNegotiate vtable patch for the protocol patch as well.

Removed the code which read the patch method from the registry and turned on the moniker
or the httpequiv patch. It is unlikely that we will need this in the future. Cleaned
up the http negotiate patch by removing references to the navigation manager and the
ReportProgress patch which is not needed anymore.

Fixes bug http://code.google.com/p/chromium/issues/detail?id=60745

Bug=60745

Review URL: http://codereview.chromium.org/4247001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64688 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 21 deletions

diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h
index 7cafc26..11b749b 100644
--- a/chrome_frame/utils.h
+++ b/chrome_frame/utils.h
@@ -42,20 +42,6 @@ extern const wchar_t kEnableGCFRendererByDefault[];
 extern const wchar_t kIexploreProfileName[];
 extern const wchar_t kRundllProfileName[];
 
-typedef enum ProtocolPatchMethod {
-  PATCH_METHOD_IBROWSER = 0,
-  PATCH_METHOD_INET_PROTOCOL,  // 1
-  PATCH_METHOD_MONIKER,  // 2
-};
-
-// A REG_DWORD config value that maps to the ProtocolPatchMethod enum.
-// To get the config value, call:
-// ProtocolPatchMethod patch_method =
-//     static_cast<ProtocolPatchMethod>(
-//          GetConfigInt(PATCH_METHOD_IBROWSER, kPatchProtocols));
-extern const wchar_t kPatchProtocols[];
-
-
 // This function is very similar to the AtlRegisterTypeLib function except
 // that it takes a parameter that specifies whether to register the typelib
 // for the current user only or on a machine-wide basis
@@ -498,13 +484,6 @@ bool IsTextHtmlMimeType(const wchar_t* mime_type);
 // Returns true iff the clipboard format is text/html.
 bool IsTextHtmlClipFormat(CLIPFORMAT cf);
 
-// Returns the desired patch method (moniker, http_equiv, protocol sink).
-// Defaults to moniker patch.
-ProtocolPatchMethod GetPatchMethod();
-
-// Returns true if the IMoniker patch is enabled.
-bool IsIBrowserServicePatchEnabled();
-
 // Returns true if we can detect that we are running as SYSTEM, false otherwise.
 bool IsSystemProcess();