diff options
author | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 17:24:29 +0000 |
---|---|---|
committer | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 17:24:29 +0000 |
commit | 552fb601aa696cc69de9fbf69f17438ac1f6f3a9 (patch) | |
tree | 1b800a99dff7facce52bb5423a056a6e1ff4356a /chrome_frame/test/reliability | |
parent | 9a30588cd1081b702ade98be4eb4a7c1344bb43e (diff) | |
download | chromium_src-552fb601aa696cc69de9fbf69f17438ac1f6f3a9.zip chromium_src-552fb601aa696cc69de9fbf69f17438ac1f6f3a9.tar.gz chromium_src-552fb601aa696cc69de9fbf69f17438ac1f6f3a9.tar.bz2 |
Remove cf: protocol
Well, almost. cf: is now changed to gcf: protocol. gcf: protocol
now is supported only for the following cases:
1. gcf:attach_external_tabXXX urls. These are URLs used internally
by Chrome Frame to implement window.open
2. gcf:about:xxx
3. gcf:view-source:xxx
4 For any other URLs ONLY if it is enabled by setting a registry
value 'EnableGCFProtocol' to 1 in HKCU\Software\Google\ChromeFrame
BUG=22721,23006,23175,29350
TEST=changed existing cf: tests to new gcf: tests, added a new test for cf:view-source
Review URL: http://codereview.chromium.org/562008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/reliability')
-rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index dd869e5..21fded4 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -133,9 +133,9 @@ class WebBrowserEventSinkImpl : public chrome_frame_test::WebBrowserEventSink { } virtual HRESULT Navigate(const std::wstring& navigate_url) { - if (StartsWith(navigate_url, L"cf:", true)) { + if (StartsWith(navigate_url, kChromeProtocolPrefix, true)) { is_chrome_frame_navigation_ = true; - url_ = navigate_url.substr(wcslen(L"cf:")); + url_ = navigate_url.substr(wcslen(kChromeProtocolPrefix)); } else { url_ = navigate_url; } @@ -349,7 +349,7 @@ class PageLoadTest : public testing::Test { // Every 3rd URL goes into the host browser. if (line_index % 3 != 0) { std::string actual_url; - actual_url = "cf:"; + actual_url = WideToUTF8(kChromeProtocolPrefix); actual_url += url_str; url_str = actual_url; } @@ -382,10 +382,12 @@ class PageLoadTest : public testing::Test { } SetConfigBool(kChromeFrameHeadlessMode, true); + SetConfigBool(kEnableGCFProtocol, true); } virtual void TearDown() { DeleteConfigValue(kChromeFrameHeadlessMode); + DeleteConfigValue(kEnableGCFProtocol); } FilePath ConstructSavedDebugLogPath(const FilePath& debug_log_path, |