diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 04:34:43 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 04:34:43 +0000 |
| commit | 354bcbaf8603cb5800737f86a84ee465166b2b4e (patch) | |
| tree | 863753d52b8f9dfb54e676bbf3d1b38a968df061 /chrome_frame/external_tab_test.cc | |
| parent | 0e097f90d5bba038b5826ebac2870aadde28d2ca (diff) | |
| download | chromium_src-354bcbaf8603cb5800737f86a84ee465166b2b4e.zip chromium_src-354bcbaf8603cb5800737f86a84ee465166b2b4e.tar.gz chromium_src-354bcbaf8603cb5800737f86a84ee465166b2b4e.tar.bz2 | |
Add support for gcf:about:plugins in chrome frame full tab mode. The URL validation code path
in ChromeFrame now takes in an interface NavigationConstraints which allows the delegateslike
the ActiveX, ActiveDocument and the NPAPI plugins to control the navigation decisions.
We no longer refer to the InternetSecurityManager interface which is IE only for performing
zone decisions in the ChromeFrame NPAPI plugin.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=66118
BUG=66118
TEST=Covered by additional CanNavigate unit tests.
Review URL: http://codereview.chromium.org/5698005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/external_tab_test.cc')
| -rw-r--r-- | chrome_frame/external_tab_test.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc index 5e3e44a..ac3359c 100644 --- a/chrome_frame/external_tab_test.cc +++ b/chrome_frame/external_tab_test.cc @@ -10,10 +10,11 @@ // #include "base/waitable_event.h" #include "chrome/common/automation_messages.h" +#include "chrome_frame/navigation_constraints.h" +#include "chrome_frame/test/chrome_frame_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock_mutant.h" -#include "chrome_frame/test/chrome_frame_test_utils.h" @@ -236,8 +237,11 @@ TEST(ExternalTabProxy, NavigateAfterCreate) { tab_params.is_widget_mode = false; tab_params.url = initial_url; + NavigationConstraintsImpl navigation_constraints; + tab->CreateTab(tab_params, &ui_delegate); - tab->Navigate("http://asgard.org", EmptyString(), true); + tab->Navigate("http://asgard.org", EmptyString(), + &navigation_constraints); loop.RunFor(5); EXPECT_FALSE(loop.WasTimedOut()); |