diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/external_tab_container.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/external_tab_container.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc index 2f9b334..9d0d089 100644 --- a/chrome/browser/external_tab_container.cc +++ b/chrome/browser/external_tab_container.cc @@ -727,12 +727,13 @@ bool ExternalTabContainer::InitNavigationInfo(IPC::NavigationInfo* nav_info, return true; } -ExternalTabContainer* ExternalTabContainer::RemovePendingTab(intptr_t cookie) { +scoped_refptr<ExternalTabContainer> ExternalTabContainer::RemovePendingTab( + intptr_t cookie) { PendingTabs::iterator index = pending_tabs_.find(cookie); if (index != pending_tabs_.end()) { scoped_refptr<ExternalTabContainer> container = (*index).second; pending_tabs_.erase(index); - return container.release(); + return container; } NOTREACHED() << "Failed to find ExternalTabContainer for cookie: " diff --git a/chrome/browser/external_tab_container.h b/chrome/browser/external_tab_container.h index 0cfdd49..0b25afb 100644 --- a/chrome/browser/external_tab_container.h +++ b/chrome/browser/external_tab_container.h @@ -163,7 +163,7 @@ class ExternalTabContainer : public TabContentsDelegate, // Returns the ExternalTabContainer instance associated with the cookie // passed in. It also erases the corresponding reference from the map. // Returns NULL if we fail to find the cookie in the map. - static ExternalTabContainer* RemovePendingTab(intptr_t cookie); + static scoped_refptr<ExternalTabContainer> RemovePendingTab(intptr_t cookie); // Enables extension automation (for e.g. UITests), with the current tab // used as a conduit for the extension API messages being handled by the |