Ensure that window.open requests issued by ChromeFrame carry the correct cook...

chrome_frame/chrome_frame_activex_base.h

 // Copyright (c) 2010 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_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_
 #define CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>
@@ skipping 462 matching lines @@
     // which is reissuing requests and turning POST into GET.
     if (moniker) {
       NavigateBrowserToMoniker(doc_site_, moniker, NULL, bind_context, NULL);
     }
 
     return TRUE;
   }
 
   virtual void OnAttachExternalTab(int tab_handle,
       const IPC::AttachExternalTabParams& params) {
-    std::string url;
-    url = StringPrintf("%lsattach_external_tab&%ls&%d&%d&%d&%d&%d",
-                       kChromeProtocolPrefix,
-                       Uint64ToWString(params.cookie).c_str(),
-                       params.disposition,
-                       params.dimensions.x(),
-                       params.dimensions.y(),
-                       params.dimensions.width(),
-                       params.dimensions.height());
+    std::wstring wide_url = url_;
+    GURL parsed_url(WideToUTF8(wide_url));
+
+    std::string url =
+        StringPrintf("%hs:%hs?attach_external_tab&%I64u&%d&%d&%d&%d&%d",
+                     parsed_url.scheme().c_str(),
+                     parsed_url.host().c_str(),
+                     params.cookie,
+                     params.disposition,
+                     params.dimensions.x(),
+                     params.dimensions.y(),
+                     params.dimensions.width(),
+                     params.dimensions.height());
     HostNavigate(GURL(url), GURL(), params.disposition);
   }
 
   virtual void OnHandleContextMenu(int tab_handle, HANDLE menu_handle,
                                    int align_flags,
                                    const IPC::ContextMenuParams& params) {
     scoped_refptr<BasePlugin> ref(this);
     ChromeFramePlugin<T>::OnHandleContextMenu(tab_handle, menu_handle,
                                               align_flags, params);
   }
@@ skipping 677 matching lines @@
   EventHandlers onreadystatechanged_;
   EventHandlers onprivatemessage_;
   EventHandlers onextensionready_;
 
   // Handle network requests when host network stack is used. Passed to the
   // automation client on initialization.
   UrlmonUrlRequestManager url_fetcher_;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_