diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 18:56:35 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 18:56:35 +0000 |
| commit | 785993e730139a6c5a93b69ca4dfdc313db59895 (patch) | |
| tree | 5a33a5b01a70bc344f438b84a1023d6ef8f8f12e /chrome_frame/external_tab_test.cc | |
| parent | 4d10edeb5f3db4366b4521c2346bfb4741c21e6f (diff) | |
| download | chromium_src-785993e730139a6c5a93b69ca4dfdc313db59895.zip chromium_src-785993e730139a6c5a93b69ca4dfdc313db59895.tar.gz chromium_src-785993e730139a6c5a93b69ca4dfdc313db59895.tar.bz2 | |
Reverting this to see if this fixes ChromeFrame tests. Please reland with the tests fixed.
Revert 64252 - The ChromeFrame objects now provides an unfrozen interface called IChromeFramePrivate. This interface provides a GetSessionId() which returns the ID used by Chrome in its Tab javascript object.
Review URL: http://codereview.chromium.org/3541017
TBR=hansl@google.com
Review URL: http://codereview.chromium.org/4134008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/external_tab_test.cc')
| -rw-r--r-- | chrome_frame/external_tab_test.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc index 375e4fb..0e49f95 100644 --- a/chrome_frame/external_tab_test.cc +++ b/chrome_frame/external_tab_test.cc @@ -133,11 +133,10 @@ struct AsyncEventCreator { } void Fire_CompletedCreateTab(bool success, HWND chrome_wnd, HWND tab_window, - int tab_handle, int session_id, - base::TimeDelta delay) { + int tab_handle, base::TimeDelta delay) { ipc_loop_->PostDelayedTask(FROM_HERE, NewRunnableMethod(delegate_, &ChromeProxyDelegate::Completed_CreateTab, success, chrome_wnd, - tab_window, tab_handle, session_id), delay.InMilliseconds()); + tab_window, tab_handle), delay.InMilliseconds()); } void Fire_TabLoaded(const GURL& url, base::TimeDelta delay) { @@ -174,7 +173,7 @@ TEST(ExternalTabProxy, CancelledCreateTab) { EXPECT_CALL(*proxy, RemoveDelegate(_)).WillOnce(DoAll( InvokeWithoutArgs(CreateFunctor(&async_events, &AsyncEventCreator::Fire_CompletedCreateTab, false, HWND(0), HWND(0), - 0, 0, base::TimeDelta::FromMilliseconds(0))), + 0, base::TimeDelta::FromMilliseconds(0))), InvokeWithoutArgs(CreateFunctor(&async_events, &AsyncEventCreator::Fire_Disconnected, base::TimeDelta::FromMilliseconds(0))), @@ -217,7 +216,7 @@ TEST(ExternalTabProxy, NavigateAfterCreate) { .WillOnce(DoAll( InvokeWithoutArgs(CreateFunctor(&async_events, &AsyncEventCreator::Fire_CompletedCreateTab, - true, HWND(0), HWND(0), 7, 0, base::TimeDelta::FromMilliseconds(9))), + true, HWND(0), HWND(0), 7, base::TimeDelta::FromMilliseconds(9))), InvokeWithoutArgs(CreateFunctor(&async_events, &AsyncEventCreator::Fire_TabLoaded, real_url, base::TimeDelta::FromMilliseconds(150))))); |