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

3 files changed, 11 insertions, 6 deletions

diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h
index adadf68..d421859 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -428,11 +428,12 @@ IPC_BEGIN_MESSAGES(Automation)
   // hosted by an external process.
   // Request:
   //   ExternalTabSettings - settings for external tab
-  IPC_SYNC_MESSAGE_ROUTED1_3(AutomationMsg_CreateExternalTab,
+  IPC_SYNC_MESSAGE_ROUTED1_4(AutomationMsg_CreateExternalTab,
                              IPC::ExternalTabSettings  /* settings*/,
                              gfx::NativeWindow  /* Tab container window */,
                              gfx::NativeWindow  /* Tab window */,
-                             int  /* Handle to the new tab */)
+                             int  /* Handle to the new tab */,
+                             int  /* Session Id of the new tab */)
 
   // This message notifies the AutomationProvider to navigate to a specified
   // url in the external tab with given handle. The first parameter is the
@@ -1099,13 +1100,14 @@ IPC_BEGIN_MESSAGES(Automation)
                       IPC::AttachExternalTabParams)
 
   // Sent when the automation client connects to an existing tab.
-  IPC_SYNC_MESSAGE_ROUTED3_3(AutomationMsg_ConnectExternalTab,
+  IPC_SYNC_MESSAGE_ROUTED3_4(AutomationMsg_ConnectExternalTab,
                              uint64 /* cookie */,
                              bool   /* allow/block tab*/,
                              gfx::NativeWindow  /* parent window */,
                              gfx::NativeWindow  /* Tab container window */,
                              gfx::NativeWindow  /* Tab window */,
-                             int  /* Handle to the new tab */)
+                             int  /* Handle to the new tab */,
+                             int  /* Session Id of the new tab */)
 
 #if defined(OS_POSIX)
   // TODO(estade): this should be merged with the windows message of the same
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 3f6eb64..748ffc2 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -487,11 +487,13 @@ scoped_refptr<TabProxy> AutomationProxy::CreateExternalTab(
     gfx::NativeWindow* external_tab_container,
     gfx::NativeWindow* tab) {
   int handle = 0;
+  int session_id = 0;
   bool succeeded =
       Send(new AutomationMsg_CreateExternalTab(0, settings,
                                                external_tab_container,
                                                tab,
-                                               &handle));
+                                               &handle,
+                                               &session_id));
   if (!succeeded) {
     return NULL;
   }
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 7d8a432..e2e494c 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -774,10 +774,11 @@ void ExternalTabUITestMockClient::ConnectToExternalTab(gfx::NativeWindow parent,
   gfx::NativeWindow tab_container = NULL;
   gfx::NativeWindow tab_window = NULL;
   int tab_handle = 0;
+  int session_id = -1;
 
   IPC::SyncMessage* message = new AutomationMsg_ConnectExternalTab(0,
       attach_params.cookie, true, NULL, &tab_container, &tab_window,
-      &tab_handle);
+      &tab_handle, &session_id);
   channel_->Send(message);
 
   RECT rect;