Chrome side of the fix for http://b/issue?id=1694574, which is a bug caused w...

chrome/browser/automation/automation_provider_win.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/automation/automation_provider.h"
 
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/external_tab_container.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ skipping 317 matching lines @@
   }
 }
 
 void AutomationProvider::CreateExternalTab(
     const IPC::ExternalTabSettings& settings,
     gfx::NativeWindow* tab_container_window, gfx::NativeWindow* tab_window,
     int* tab_handle) {
   *tab_handle = 0;
   *tab_container_window = NULL;
   *tab_window = NULL;
-  ExternalTabContainer* external_tab_container =
+  scoped_refptr<ExternalTabContainer> external_tab_container =
       new ExternalTabContainer(this, automation_resource_message_filter_);
+
   Profile* profile = settings.is_off_the_record ?
       profile_->GetOffTheRecordProfile() : profile_;
+
+  // When the ExternalTabContainer window is created we grab a reference on it
+  // which is released when the window is destroyed.
   external_tab_container->Init(profile, settings.parent, settings.dimensions,
       settings.style, settings.load_requests_via_automation,
       settings.handle_top_level_requests, NULL);
 
   if (AddExternalTab(external_tab_container)) {
     TabContents* tab_contents = external_tab_container->tab_contents();
     *tab_handle = external_tab_container->tab_handle();
     external_tab_container->set_tab_handle(*tab_handle);
     *tab_container_window = external_tab_container->GetNativeView();
     *tab_window = tab_contents->GetNativeView();
   } else {
-    delete external_tab_container;
+    external_tab_container->Uninitialize();
   }
 }
 
 bool AutomationProvider::AddExternalTab(ExternalTabContainer* external_tab) {
   DCHECK(external_tab != NULL);
 
   TabContents* tab_contents = external_tab->tab_contents();
   if (tab_contents) {
     int tab_handle = tab_tracker_->Add(&tab_contents->controller());
     external_tab->set_tab_handle(tab_handle);
@@ skipping 80 matching lines @@
 
     TabContents* tab_contents = tab->tab_contents();
     if (!tab_contents || !tab_contents->delegate()) {
       NOTREACHED();
       return;
     }
 
     tab_contents->delegate()->ExecuteContextMenuCommand(command);
   }
 }
+
+void AutomationProvider::ConnectExternalTab(
+    intptr_t cookie,
+    gfx::NativeWindow* tab_container_window,
+    gfx::NativeWindow* tab_window,
+    int* tab_handle) {
+  *tab_handle = 0;
+  *tab_container_window = NULL;
+  *tab_window = NULL;
+
+  scoped_refptr<ExternalTabContainer> external_tab_container =
+      ExternalTabContainer::RemovePendingTab(cookie);
+  if (!external_tab_container.get()) {
+    NOTREACHED();
+    return;
+  }
+
+  if (AddExternalTab(external_tab_container)) {
+    external_tab_container->Reinitialize(this,
+                                         automation_resource_message_filter_);
+    TabContents* tab_contents = external_tab_container->tab_contents();
+    *tab_handle = external_tab_container->tab_handle();
+    external_tab_container->set_tab_handle(*tab_handle);
+    *tab_container_window = external_tab_container->GetNativeView();
+    *tab_window = tab_contents->GetNativeView();
+  } else {
+    external_tab_container->Uninitialize();
+  }
+}
+