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

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

Issue 303005: Correcting name of data file used for CF protocol test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 2 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-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 <windows.h> 4 #include <windows.h>
5 #include <stdarg.h> 5 #include <stdarg.h>
6 6
7 // IShellWindows includes. Unfortunately we can't keep these in 7 // IShellWindows includes. Unfortunately we can't keep these in
8 // alphabetic order since exdisp will bark if some interfaces aren't fully 8 // alphabetic order since exdisp will bark if some interfaces aren't fully
9 // defined. 9 // defined.
10 #include <mshtml.h> 10 #include <mshtml.h>
(...skipping 1402 matching lines...) Expand 10 before | Expand all | Expand 10 after
1413 false)); 1413 false));
1414 loop_.RunFor(4); 1414 loop_.RunFor(4);
1415 client_->Uninitialize(); 1415 client_->Uninitialize();
1416 } 1416 }
1417 1417
1418 const wchar_t kMetaTagPage[] = L"files/meta_tag.html"; 1418 const wchar_t kMetaTagPage[] = L"files/meta_tag.html";
1419 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_MetaTag) { 1419 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_MetaTag) {
1420 SimpleBrowserTest(IE, kMetaTagPage, L"meta_tag"); 1420 SimpleBrowserTest(IE, kMetaTagPage, L"meta_tag");
1421 } 1421 }
1422 1422
1423 const wchar_t kCFProtocolPage[] = L"files/chrome_frame_protocol.html"; 1423 const wchar_t kCFProtocolPage[] = L"files/cf_protocol.html";
1424 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_CFProtocol) { 1424 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_CFProtocol) {
1425 SimpleBrowserTest(IE, kCFProtocolPage, L"chrome_frame_protocol"); 1425 SimpleBrowserTest(IE, kCFProtocolPage, L"chrome_frame_protocol");
1426 } 1426 }
1427 1427
1428 const wchar_t kPersistentCookieTest[] = 1428 const wchar_t kPersistentCookieTest[] =
1429 L"files/persistent_cookie_test_page.html"; 1429 L"files/persistent_cookie_test_page.html";
1430 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_PersistentCookieTest) { 1430 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_PersistentCookieTest) {
1431 SimpleBrowserTest(IE, kPersistentCookieTest, L"PersistentCookieTest"); 1431 SimpleBrowserTest(IE, kPersistentCookieTest, L"PersistentCookieTest");
1432 } 1432 }
1433 1433
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
1511 EXPECT_TRUE(hr == S_OK); 1511 EXPECT_TRUE(hr == S_OK);
1512 1512
1513 web_browser2.Release(); 1513 web_browser2.Release();
1514 chrome_frame_test::CloseAllIEWindows(); 1514 chrome_frame_test::CloseAllIEWindows();
1515 1515
1516 if (should_uninit) { 1516 if (should_uninit) {
1517 CoUninitialize(); 1517 CoUninitialize();
1518 } 1518 }
1519 } 1519 }
1520 1520
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