summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/test_with_web_server.cc
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-02 10:35:08 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-02 10:35:08 +0000
commit64cad667747a5ffcbedb84f497f70325b8244dcf (patch)
treeb79748afa99029021e083f44cc5597ba70508d37 /chrome_frame/test/test_with_web_server.cc
parent01760f77e37b7c9e66573ac02741ccba1493f929 (diff)
downloadchromium_src-64cad667747a5ffcbedb84f497f70325b8244dcf.zip
chromium_src-64cad667747a5ffcbedb84f497f70325b8244dcf.tar.gz
chromium_src-64cad667747a5ffcbedb84f497f70325b8244dcf.tar.bz2
Revert 149604 - Support calling GrabWindowSnapshot when no BrowserProcess instance is avaliable (eg. tests)
BUG=139694 Review URL: https://chromiumcodereview.appspot.com/10821104 TBR=qfel@google.com Review URL: https://chromiumcodereview.appspot.com/10830135 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/test_with_web_server.cc')
-rw-r--r--chrome_frame/test/test_with_web_server.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index 065dd42..b7dba98 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -697,7 +697,8 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_XHRTest) {
const wchar_t kInstallFlowTestUrl[] =
L"install_flow_test.html";
-TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_InstallFlowTest) {
+// crbug.com/139694
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_InstallFlowTest) {
if (base::win::GetVersion() < base::win::VERSION_VISTA) {
ScopedChromeFrameRegistrar::UnregisterAtPath(
GetChromeFrameBuildPath().value(),
@@ -901,7 +902,8 @@ 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.
-TEST_F(ChromeFrameTestWithWebServer, FAILS_FullTabModeIE_RefreshMshtmlTest) {
+// crbug.com/139694
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_RefreshMshtmlTest) {
const wchar_t* kPages[] = {
L"mshtml_refresh_test.html",
L"mshtml_refresh_test_popup.html",