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

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

Issue 1562012: Correct the bug number for the disabled chrome frame tests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 8 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 | chrome_frame/test/test_with_web_server.cc » ('j') | 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 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after
1247 1247
1248 HRESULT hr = mock.LaunchIEAndNavigate(kHostBrowserUrl); 1248 HRESULT hr = mock.LaunchIEAndNavigate(kHostBrowserUrl);
1249 ASSERT_HRESULT_SUCCEEDED(hr); 1249 ASSERT_HRESULT_SUCCEEDED(hr);
1250 if (hr == S_FALSE) 1250 if (hr == S_FALSE)
1251 return; 1251 return;
1252 1252
1253 ASSERT_TRUE(mock.web_browser2() != NULL); 1253 ASSERT_TRUE(mock.web_browser2() != NULL);
1254 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 2); 1254 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 2);
1255 } 1255 }
1256 1256
1257 // http://code.google.com/p/chromium/issues/detail?id=40266 1257 // http://code.google.com/p/chromium/issues/detail?id=40124
1258 TEST(IEPrivacy, DISABLED_NavigationToRestrictedSite) { 1258 TEST(IEPrivacy, DISABLED_NavigationToRestrictedSite) {
1259 CloseIeAtEndOfScope last_resort_close_ie; 1259 CloseIeAtEndOfScope last_resort_close_ie;
1260 chrome_frame_test::TimedMsgLoop loop; 1260 chrome_frame_test::TimedMsgLoop loop;
1261 ComStackObjectWithUninitialize<MockWebBrowserEventSink> mock; 1261 ComStackObjectWithUninitialize<MockWebBrowserEventSink> mock;
1262 ChromeFrameHTTPServer server; 1262 ChromeFrameHTTPServer server;
1263 server.SetUp(); 1263 server.SetUp();
1264 1264
1265 ScopedComPtr<IInternetSecurityManager> security_manager; 1265 ScopedComPtr<IInternetSecurityManager> security_manager;
1266 HRESULT hr = security_manager.CreateInstance(CLSID_InternetSecurityManager); 1266 HRESULT hr = security_manager.CreateInstance(CLSID_InternetSecurityManager);
1267 ASSERT_HRESULT_SUCCEEDED(hr); 1267 ASSERT_HRESULT_SUCCEEDED(hr);
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 ASSERT_HRESULT_SUCCEEDED(hr); 1446 ASSERT_HRESULT_SUCCEEDED(hr);
1447 if (hr == S_OK) { 1447 if (hr == S_OK) {
1448 ASSERT_TRUE(mock.web_browser2() != NULL); 1448 ASSERT_TRUE(mock.web_browser2() != NULL);
1449 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 2); 1449 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 2);
1450 } 1450 }
1451 1451
1452 EXPECT_EQ(1, response->get_request_count()); 1452 EXPECT_EQ(1, response->get_request_count());
1453 EXPECT_EQ(1, response->post_request_count()); 1453 EXPECT_EQ(1, response->post_request_count());
1454 } 1454 }
1455 1455
OLDNEW
« no previous file with comments | « no previous file | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698