diff options
| author | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 15:24:05 +0000 |
|---|---|---|
| committer | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 15:24:05 +0000 |
| commit | 5b811ad2f12a21e218e92d1498f972a4c95ce68d (patch) | |
| tree | 2d4ff0078076fd5a566d7543b4d6285fc2a5825e /chrome_frame/chrome_frame_activex_base.h | |
| parent | a973a7147660bff86c36c43a30969bb179492f47 (diff) | |
| download | chromium_src-5b811ad2f12a21e218e92d1498f972a4c95ce68d.zip chromium_src-5b811ad2f12a21e218e92d1498f972a4c95ce68d.tar.gz chromium_src-5b811ad2f12a21e218e92d1498f972a4c95ce68d.tar.bz2 | |
Test Selenium core on chrome frame
First cut of Selenium core support on Chrome Frame. 2 tests fail.
Selenium tests are now served by mock http server. When the test
is finished it posts a message with number of tests ran and failures.
Also fixed 'attach external tab' mechanism to include the same URL origin
including the port.
BUG=50372
TEST=FullTabSeleniumTest.Core
Review URL: http://codereview.chromium.org/5371001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex_base.h')
| -rw-r--r-- | chrome_frame/chrome_frame_activex_base.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index 9389d79..c3bdfeb 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -490,9 +490,6 @@ END_MSG_MAP() std::wstring wide_url = url_; GURL parsed_url(WideToUTF8(wide_url)); - std::string scheme(parsed_url.scheme()); - std::string host(parsed_url.host()); - // If Chrome-Frame is presently navigated to an extension page, navigating // the host to a url with scheme chrome-extension will fail, so we // point the host at http:local_host. Note that this is NOT the URL @@ -501,14 +498,18 @@ END_MSG_MAP() // be constructed in the new IE tab. if (parsed_url.SchemeIs("chrome-extension") && is_privileged_) { - scheme = "http"; - host = "local_host"; + const char kScheme[] = "http"; + const char kHost[] = "local_host"; + + GURL::Replacements r; + r.SetScheme(kScheme, url_parse::Component(0, sizeof(kScheme) -1)); + r.SetHost(kHost, url_parse::Component(0, sizeof(kHost) - 1)); + parsed_url = parsed_url.ReplaceComponents(r); } std::string url = base::StringPrintf( - "%hs://%hs?attach_external_tab&%I64u&%d&%d&%d&%d&%d&%hs", - scheme.c_str(), - host.c_str(), + "%hs?attach_external_tab&%I64u&%d&%d&%d&%d&%d&%hs", + parsed_url.GetOrigin().spec().c_str(), params.cookie, params.disposition, params.dimensions.x(), |