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

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

Issue 345032: Updates CFInstall.js to:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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 | « chrome_frame/CFInstall.js ('k') | chrome_frame/test/data/CFInstall_basic.html » ('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-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 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 L"files/CFInstance_default_ctor_host.html"; 557 L"files/CFInstance_default_ctor_host.html";
558 558
559 TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceDefaultCtor) { 559 TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceDefaultCtor) {
560 SimpleBrowserTest(IE, kCFIDefaultCtorPage, L"CFInstanceDefaultCtor"); 560 SimpleBrowserTest(IE, kCFIDefaultCtorPage, L"CFInstanceDefaultCtor");
561 } 561 }
562 562
563 TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceDefaultCtor) { 563 TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceDefaultCtor) {
564 SimpleBrowserTest(FIREFOX, kCFIDefaultCtorPage, L"CFInstanceDefaultCtor"); 564 SimpleBrowserTest(FIREFOX, kCFIDefaultCtorPage, L"CFInstanceDefaultCtor");
565 } 565 }
566 566
567
568 const wchar_t kCFInstallBasicTestPage[] = L"files/CFInstall_basic.html";
569
570 TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallBasic) {
571 SimpleBrowserTest(IE, kCFInstallBasicTestPage, L"CFInstallBasic");
572 }
573
574 const wchar_t kCFInstallPlaceTestPage[] = L"files/CFInstall_place.html";
575
576 TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallPlace) {
577 SimpleBrowserTest(IE, kCFInstallPlaceTestPage, L"CFInstallPlace");
578 }
579
580 const wchar_t kCFInstallOverlayTestPage[] = L"files/CFInstall_overlay.html";
581
582 TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallOverlay) {
583 SimpleBrowserTest(IE, kCFInstallOverlayTestPage, L"CFInstallOverlay");
584 }
585
586 const wchar_t kCFInstallDismissTestPage[] = L"files/CFInstall_dismiss.html";
587
588 TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallDismiss) {
589 SimpleBrowserTest(IE, kCFInstallDismissTestPage, L"CFInstallDismiss");
590 }
591
567 const wchar_t kInitializeHiddenPage[] = L"files/initialize_hidden.html"; 592 const wchar_t kInitializeHiddenPage[] = L"files/initialize_hidden.html";
568 593
569 TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_InitializeHidden) { 594 TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_InitializeHidden) {
570 SimpleBrowserTest(IE, kInitializeHiddenPage, L"InitializeHidden"); 595 SimpleBrowserTest(IE, kInitializeHiddenPage, L"InitializeHidden");
571 } 596 }
572 597
573 TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_InitializeHidden) { 598 TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_InitializeHidden) {
574 SimpleBrowserTest(FIREFOX, kInitializeHiddenPage, L"InitializeHidden"); 599 SimpleBrowserTest(FIREFOX, kInitializeHiddenPage, L"InitializeHidden");
575 } 600 }
576 601
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after
1508 return; 1533 return;
1509 1534
1510 ASSERT_TRUE(mock.web_browser2() != NULL); 1535 ASSERT_TRUE(mock.web_browser2() != NULL);
1511 1536
1512 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); 1537 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
1513 1538
1514 mock.Uninitialize(); 1539 mock.Uninitialize();
1515 chrome_frame_test::CloseAllIEWindows(); 1540 chrome_frame_test::CloseAllIEWindows();
1516 } 1541 }
1517 1542
OLDNEW
« no previous file with comments | « chrome_frame/CFInstall.js ('k') | chrome_frame/test/data/CFInstall_basic.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698