summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test
diff options
context:
space:
mode:
authorqfel@google.com <qfel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-06 11:19:29 +0000
committerqfel@google.com <qfel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-06 11:19:29 +0000
commitdbbe44200d22ef5f7de4c36062f70534416b0da8 (patch)
tree90cc899c1bd01c8d4f87817a2cebb048a1456269 /chrome_frame/test
parent06d5f32107b364e3c4059f459ea296ea41c703b4 (diff)
downloadchromium_src-dbbe44200d22ef5f7de4c36062f70534416b0da8.zip
chromium_src-dbbe44200d22ef5f7de4c36062f70534416b0da8.tar.gz
chromium_src-dbbe44200d22ef5f7de4c36062f70534416b0da8.tar.bz2
Refactor GrabWindowSnapshot and GrabWindowSnapshotImpl names to GrabWindowSnapshotForUser and GrabWindowSnapshot respectively.
Use GrabWindowSnapshot (the old internal version) in tests. BUG=139694 Review URL: https://chromiumcodereview.appspot.com/10830158 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
-rw-r--r--chrome_frame/test/test_with_web_server.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index b7dba98..065dd42 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -697,8 +697,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_XHRTest) {
const wchar_t kInstallFlowTestUrl[] =
L"install_flow_test.html";
-// crbug.com/139694
-TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_InstallFlowTest) {
+TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_InstallFlowTest) {
if (base::win::GetVersion() < base::win::VERSION_VISTA) {
ScopedChromeFrameRegistrar::UnregisterAtPath(
GetChromeFrameBuildPath().value(),
@@ -902,8 +901,7 @@ class UaTemplateFileResponse : public test_server::FileResponse {
//
// This test currently fails because GCF does not add the chromeframe header
// to requests that mshtml initiates via IInternetSession::CreateBinding.
-// crbug.com/139694
-TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_RefreshMshtmlTest) {
+TEST_F(ChromeFrameTestWithWebServer, FAILS_FullTabModeIE_RefreshMshtmlTest) {
const wchar_t* kPages[] = {
L"mshtml_refresh_test.html",
L"mshtml_refresh_test_popup.html",