diff options
| author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-26 21:34:34 +0000 |
|---|---|---|
| committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-26 21:34:34 +0000 |
| commit | 11740d25bd6ac9c9da9ceb99ba1ba59d3caabeeb (patch) | |
| tree | da02100d631a884caa7c30eec99796e7f6537328 /ceee | |
| parent | dcdf32015f8971d0bfd9944f6e54a65b0ad142fa (diff) | |
| download | chromium_src-11740d25bd6ac9c9da9ceb99ba1ba59d3caabeeb.zip chromium_src-11740d25bd6ac9c9da9ceb99ba1ba59d3caabeeb.tar.gz chromium_src-11740d25bd6ac9c9da9ceb99ba1ba59d3caabeeb.tar.bz2 | |
Fix a unittest in content script manager I broke in an earlier change.
Also quench an uninteresting call notification from GMock.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5280007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
| -rw-r--r-- | ceee/ie/plugin/scripting/content_script_manager_unittest.cc | 2 | ||||
| -rw-r--r-- | ceee/ie/plugin/scripting/renderer_extension_bindings_unittest.cc | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ceee/ie/plugin/scripting/content_script_manager_unittest.cc b/ceee/ie/plugin/scripting/content_script_manager_unittest.cc index 8ab9602..c416e8f 100644 --- a/ceee/ie/plugin/scripting/content_script_manager_unittest.cc +++ b/ceee/ie/plugin/scripting/content_script_manager_unittest.cc @@ -402,6 +402,7 @@ TEST_F(ContentScriptManagerTest, ScriptInitializationOnUrlMatch) { // The script host needs to be shut down on teardown. EXPECT_CALL(*script_host_, Close()).Times(1); + EXPECT_CALL(*frame_host_, CloseAll(_)).Times(1); ASSERT_HRESULT_SUCCEEDED(manager.TearDown()); } @@ -458,6 +459,7 @@ TEST_F(ContentScriptManagerTest, ExecuteScript) { // The script host needs to be shut down on teardown. EXPECT_CALL(*script_host_, Close()).Times(1); + EXPECT_CALL(*frame_host_, CloseAll(_)).Times(1); ASSERT_HRESULT_SUCCEEDED(manager.TearDown()); } diff --git a/ceee/ie/plugin/scripting/renderer_extension_bindings_unittest.cc b/ceee/ie/plugin/scripting/renderer_extension_bindings_unittest.cc index 4f441a9..4714765 100644 --- a/ceee/ie/plugin/scripting/renderer_extension_bindings_unittest.cc +++ b/ceee/ie/plugin/scripting/renderer_extension_bindings_unittest.cc @@ -397,6 +397,7 @@ TEST_F(RendererExtensionBindingsTest, OnDisconnect) { // A 'SUCCESS' log signals success. EXPECT_CALL(*api_, Log(StrEq(L"info"), StrEq(L"SUCCESS"))).Times(1); + EXPECT_CALL(*api_, CloseChannel(kPortId)); EXPECT_HRESULT_SUCCEEDED(api_->CallOnPortDisconnect(kPortId)); } |