Fix failing ChromeFrame window open tests on IE6/7. These tests started failing since

we started passing in the profile name in the list of parameters being passed to the
attach external tab request. The tests failed because when we launch the automation server
we match the profile names which end up being different for the original document url which
defaults to iexplore and the attach tab request which contains the profile name under which
chrome is launched which changes to Google Chrome Frame for IE6/7. We also need to escape
out the profile name while parsing it in the ParseAttachExternalTabUrl helper class.

Will add a test in a subsequent CL.

TBR=amit,twiz

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

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

1 files changed, 6 insertions, 2 deletions

diff --git a/chrome_frame/chrome_frame_plugin.h b/chrome_frame/chrome_frame_plugin.h
index 9f3e0ac..de63b3c 100644
--- a/chrome_frame/chrome_frame_plugin.h
+++ b/chrome_frame/chrome_frame_plugin.h
@@ -15,7 +15,6 @@
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome_frame/simple_resource_loader.h"
 #include "chrome_frame/utils.h"
-
 #include "grit/chromium_strings.h"
 
 #define IDC_ABOUT_CHROME_FRAME 40018
@@ -70,8 +69,13 @@ END_MSG_MAP()
     bool incognito_mode = !is_privileged_ && incognito;
     FilePath profile_path;
     GetProfilePath(profile_name, &profile_path);
+    // The profile name could change based on the browser version. For e.g. for
+    // IE6/7 the profile is created in a different folder whose last component
+    // is Google Chrome Frame.
+    FilePath actual_profile_name = profile_path.BaseName();
     launch_params_ = new ChromeFrameLaunchParams(url, referrer, profile_path,
-        profile_name, extra_chrome_arguments, incognito_mode, is_widget_mode);
+        actual_profile_name.value(), extra_chrome_arguments, incognito_mode,
+        is_widget_mode);
     return automation_client_->Initialize(this, launch_params_);
   }