Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Side by Side Diff: chrome_frame/test/test_mock_with_web_server.cc

Issue 2838036: Disabling the ChromeFrame NavigationToRestrictedSite test as it causes IE8 to... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #include "chrome_frame/test/test_mock_with_web_server.h" 4 #include "chrome_frame/test/test_mock_with_web_server.h"
5 5
6 #include <mshtmcid.h> 6 #include <mshtmcid.h>
7 7
8 #include "base/scoped_bstr_win.h" 8 #include "base/scoped_bstr_win.h"
9 #include "chrome/common/url_constants.h" 9 #include "chrome/common/url_constants.h"
10 #include "chrome_frame/utils.h" 10 #include "chrome_frame/utils.h"
(...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after
1271 1271
1272 HRESULT hr = mock.LaunchIEAndNavigate(kHostBrowserUrl); 1272 HRESULT hr = mock.LaunchIEAndNavigate(kHostBrowserUrl);
1273 ASSERT_HRESULT_SUCCEEDED(hr); 1273 ASSERT_HRESULT_SUCCEEDED(hr);
1274 if (hr == S_FALSE) 1274 if (hr == S_FALSE)
1275 return; 1275 return;
1276 1276
1277 ASSERT_TRUE(mock.web_browser2() != NULL); 1277 ASSERT_TRUE(mock.web_browser2() != NULL);
1278 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 2); 1278 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 2);
1279 } 1279 }
1280 1280
1281 TEST(IEPrivacy, NavigationToRestrictedSite) { 1281 // Test has been disabled as it causes the IE8 bot to hang at times.
1282 // http://crbug.com/47596
1283 TEST(IEPrivacy, DISABLED_NavigationToRestrictedSite) {
1282 if (IsIBrowserServicePatchEnabled()) { 1284 if (IsIBrowserServicePatchEnabled()) {
1283 LOG(ERROR) << "Not running test. IBrowserServicePatch is in place."; 1285 LOG(ERROR) << "Not running test. IBrowserServicePatch is in place.";
1284 return; 1286 return;
1285 } 1287 }
1286 CloseIeAtEndOfScope last_resort_close_ie; 1288 CloseIeAtEndOfScope last_resort_close_ie;
1287 ComStackObjectWithUninitialize<MockWebBrowserEventSink> mock; 1289 ComStackObjectWithUninitialize<MockWebBrowserEventSink> mock;
1288 chrome_frame_test::TimedMsgLoop loop; 1290 chrome_frame_test::TimedMsgLoop loop;
1289 ChromeFrameHTTPServer server; 1291 ChromeFrameHTTPServer server;
1290 server.SetUp(); 1292 server.SetUp();
1291 1293
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
1624 if (hr == S_FALSE) 1626 if (hr == S_FALSE)
1625 return; 1627 return;
1626 1628
1627 ASSERT_TRUE(mock.web_browser2() != NULL); 1629 ASSERT_TRUE(mock.web_browser2() != NULL);
1628 1630
1629 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 2); 1631 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 2);
1630 1632
1631 ASSERT_TRUE(new_window_mock.web_browser2() != NULL); 1633 ASSERT_TRUE(new_window_mock.web_browser2() != NULL);
1632 } 1634 }
1633 1635
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698