Cleaning up capture_web_contents_function.

chrome/browser/extensions/extension_tab_util.h

Index: chrome/browser/extensions/extension_tab_util.h
diff --git a/chrome/browser/extensions/extension_tab_util.h b/chrome/browser/extensions/extension_tab_util.h
index 9dbeaef22ad707e20d5440e41e74f1a01929213f..0f185d2617dba7cd55928f684a3ba45059a9f8bc 100644
--- a/chrome/browser/extensions/extension_tab_util.h
+++ b/chrome/browser/extensions/extension_tab_util.h
@@ -11,7 +11,9 @@
 #include "ui/base/window_open_disposition.h"
 
 class Browser;
+class ChromeExtensionFunctionDetails;
 class ChromeUIThreadExtensionFunction;
+class ExtensionFunction;
 class GURL;
 class Profile;
 class TabStripModel;
@@ -72,11 +74,20 @@ class ExtensionTabUtil {
   static int GetWindowIdOfTab(const content::WebContents* web_contents);
   static base::ListValue* CreateTabList(const Browser* browser,
                                         const Extension* extension);
+
+  // DEPRECATED: Please consider using ChromeExtensionFunctionDetails instead
+  // of the deprecated ChromeUIThreadExtensionFunction and use the overload
+  // below
   static Browser* GetBrowserFromWindowID(
       ChromeUIThreadExtensionFunction* function,
       int window_id,
       std::string* error_message);
 
+  static Browser* GetBrowserFromWindowID(
+      const ChromeExtensionFunctionDetails& details,
+      int window_id,
+      std::string* error_message);
+
   // Creates a Tab object (see chrome/common/extensions/api/tabs.json) with
   // information about the state of a browser tab.  Depending on the
   // permissions of the extension, the object may or may not include sensitive