Add support for returning the session_id in both CreateExternalTab and ConnectExternalTab.

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. This ID is necessary in CEEE for its tabs management.

BUG=None
TEST=None
Review URL: http://codereview.chromium.org/4467002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65257 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 4 deletions

diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc
index 0e49f95..375e4fb 100644
--- a/chrome_frame/external_tab_test.cc
+++ b/chrome_frame/external_tab_test.cc
@@ -133,10 +133,11 @@ struct AsyncEventCreator {
   }
 
   void Fire_CompletedCreateTab(bool success, HWND chrome_wnd, HWND tab_window,
-                               int tab_handle, base::TimeDelta delay) {
+                               int tab_handle, int session_id,
+                               base::TimeDelta delay) {
     ipc_loop_->PostDelayedTask(FROM_HERE, NewRunnableMethod(delegate_,
         &ChromeProxyDelegate::Completed_CreateTab, success, chrome_wnd,
-        tab_window, tab_handle), delay.InMilliseconds());
+        tab_window, tab_handle, session_id), delay.InMilliseconds());
   }
 
   void Fire_TabLoaded(const GURL& url, base::TimeDelta delay) {
@@ -173,7 +174,7 @@ TEST(ExternalTabProxy, CancelledCreateTab) {
   EXPECT_CALL(*proxy, RemoveDelegate(_)).WillOnce(DoAll(
       InvokeWithoutArgs(CreateFunctor(&async_events,
           &AsyncEventCreator::Fire_CompletedCreateTab, false, HWND(0), HWND(0),
-          0, base::TimeDelta::FromMilliseconds(0))),
+          0, 0, base::TimeDelta::FromMilliseconds(0))),
       InvokeWithoutArgs(CreateFunctor(&async_events,
           &AsyncEventCreator::Fire_Disconnected,
           base::TimeDelta::FromMilliseconds(0))),
@@ -216,7 +217,7 @@ TEST(ExternalTabProxy, NavigateAfterCreate) {
       .WillOnce(DoAll(
       InvokeWithoutArgs(CreateFunctor(&async_events,
           &AsyncEventCreator::Fire_CompletedCreateTab,
-          true, HWND(0), HWND(0), 7, base::TimeDelta::FromMilliseconds(9))),
+          true, HWND(0), HWND(0), 7, 0, base::TimeDelta::FromMilliseconds(9))),
       InvokeWithoutArgs(CreateFunctor(&async_events,
           &AsyncEventCreator::Fire_TabLoaded, real_url,
           base::TimeDelta::FromMilliseconds(150)))));