diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 14:52:40 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 14:52:40 +0000 |
| commit | fbb1bffa8523f50389815d80038949ce7af6c0c6 (patch) | |
| tree | a174ebe91d4d1583e3fa718e489e0af627721ffc /chrome_frame | |
| parent | 9ebe4e57b30746f8b2ddc96a4c0da7e8a06403f0 (diff) | |
| download | chromium_src-fbb1bffa8523f50389815d80038949ce7af6c0c6.zip chromium_src-fbb1bffa8523f50389815d80038949ce7af6c0c6.tar.gz chromium_src-fbb1bffa8523f50389815d80038949ce7af6c0c6.tar.bz2 | |
Removing a test I missed when removing CEEE-specific functionality.
BUG=none
TEST=chrome_frame_tests
Review URL: http://codereview.chromium.org/6806020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/data/sessionid.html | 39 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 31 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.h | 4 |
3 files changed, 1 insertions, 73 deletions
diff --git a/chrome_frame/test/data/sessionid.html b/chrome_frame/test/data/sessionid.html deleted file mode 100644 index 14e84bc..0000000 --- a/chrome_frame/test/data/sessionid.html +++ /dev/null @@ -1,39 +0,0 @@ -<html> -<!-- This page is meant to load inside the host browser like IE/FF --> - <head> - <script type="text/javascript" src="chrome_frame_tester_helpers.js"> - </script> - <script type="text/javascript"> - function onLoad() { - document.ChromeFrame.addEventListener('readystatechanged', - function() { - if (document.ChromeFrame.readystate == 4) { // READY_STATE_COMPLETED - var sessionId = document.ChromeFrame.sessionid; - appendStatus('Chrome frame sessionId: ' + sessionId); - if (sessionId == 1) { - onSuccess('sessionid', 1); - } else { - onFailure('sessionid', 1, 'no sessionId'); - } - } - }, false); - } - </script> - </head> - - <body onload="onLoad();"> - <object id="ChromeFrame" - codebase="http://www.google.com" - classid="CLSID:E0A900DF-9611-4446-86BD-4B1D47E7DB2A"> - <embed id="ChromeFramePlugin" name="ChromeFrame" - type="application/chromeframe" privileged_mode="1" - </embed> - </object> - <br> - <br> - <p>Test for Chrome frame sessionid</p> - <div id="statusPanel" style="border: 1px solid red; width: 100%"> - Test running.... - </div> - </body> -</html> diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 8c62f03..cfb6b34 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -296,25 +296,6 @@ void ChromeFrameTestWithWebServer::VersionTest(BrowserKind browser, ASSERT_EQ(version, UTF8ToWide(server_mock_.posted_result())); } -void ChromeFrameTestWithWebServer::SessionIdTest(BrowserKind browser, - const wchar_t* page, - int privilege_mode, - const char* expected_result) { - if (browser == FIREFOX && - base::win::GetVersion() == base::win::VERSION_WIN7) { - LOG(INFO) << "Not running Firefox tests on Windows 7"; - return; - } - - SetConfigInt(kEnableFirefoxPrivilegeMode, privilege_mode); - EXPECT_TRUE(LaunchBrowser(browser, page)); - server_mock_.set_expected_result(expected_result); - server_mock_.ExpectAndHandlePostedResult(CFInvocation(CFInvocation::NONE), - kPostedResultSubstring); - WaitForTestToComplete(TestTimeouts::action_max_timeout_ms()); - ASSERT_EQ(expected_result, server_mock_.posted_result()); -} - // MockWebServer methods void MockWebServer::ExpectAndServeRequest(CFInvocation invocation, const std::wstring& url) { @@ -838,16 +819,6 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_Version) { VersionTest(FIREFOX, kVersionPage); } -const wchar_t kSessionIdPage[] = L"sessionid.html"; - -TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_SessionIdPrivilege) { - SessionIdTest(FIREFOX, kSessionIdPage, 1, "OK"); -} - -TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_SessionIdNoPrivilege) { - SessionIdTest(FIREFOX, kSessionIdPage, 0, "no sessionId"); -} - const wchar_t kEventListenerPage[] = L"event_listener.html"; TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_EventListener) { diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h index 12bce26..59e9e2c 100644 --- a/chrome_frame/test/test_with_web_server.h +++ b/chrome_frame/test/test_with_web_server.h @@ -176,10 +176,6 @@ class ChromeFrameTestWithWebServer: public testing::Test { // Test if chrome frame correctly reports its version. void VersionTest(BrowserKind browser, const wchar_t* page); - // Test if chrome frame correctly reports its session Id. - void SessionIdTest(BrowserKind browser, const wchar_t* page, - int privilege_mode, const char* expected_result); - // Closes all browsers in preparation for a test and during cleanup. void CloseAllBrowsers(); |