[Extensions] Convert some ChromeSyncExtensionFunctions

chrome/browser/extensions/extension_tab_util.cc

 // Copyright (c) 2012 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/extensions/extension_tab_util.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 77 matching lines @@
     }
   }
 
   if (error_message)
     *error_message = ErrorUtils::FormatErrorMessage(
         keys::kWindowNotFoundError, base::IntToString(window_id));
 
   return NULL;
 }
 
-Browser* CreateBrowser(ChromeUIThreadExtensionFunction* function,
-                       int window_id,
-                       std::string* error) {
-  Browser::CreateParams params(Browser::TYPE_TABBED, function->GetProfile());
+Browser* CreateBrowser(Profile* profile, int window_id, std::string* error) {
+  Browser::CreateParams params(Browser::TYPE_TABBED, profile);
   Browser* browser = new Browser(params);
   browser->window()->Show();
   return browser;
 }
 
 // Use this function for reporting a tab id to an extension. It will
 // take care of setting the id to TAB_ID_NONE if necessary (for
 // example with devtools).
 int GetTabIdForExtensions(const WebContents* web_contents) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   if (browser && !ExtensionTabUtil::BrowserSupportsTabs(browser))
     return -1;
   return SessionTabHelper::IdForTab(web_contents);
 }
 
 }  // namespace
 
 ExtensionTabUtil::OpenTabParams::OpenTabParams()
     : create_browser_if_needed(false) {
 }
 
 ExtensionTabUtil::OpenTabParams::~OpenTabParams() {
 }
 
 // Opens a new tab for a given extension. Returns NULL and sets |error| if an
 // error occurs.
 base::DictionaryValue* ExtensionTabUtil::OpenTab(
-    ChromeUIThreadExtensionFunction* function,
+    UIThreadExtensionFunction* function,
     const OpenTabParams& params,
     std::string* error) {
+  ChromeExtensionFunctionDetails chrome_details(function);
+  Profile* profile = chrome_details.GetProfile();
   // windowId defaults to "current" window.
   int window_id = extension_misc::kCurrentWindowId;
   if (params.window_id.get())
     window_id = *params.window_id;
 
-  Browser* browser = GetBrowserFromWindowID(function, window_id, error);
+  Browser* browser = GetBrowserFromWindowID(chrome_details, window_id, error);
   if (!browser) {
     if (!params.create_browser_if_needed) {
       return NULL;
     }
-    browser = CreateBrowser(function, window_id, error);
+    browser = CreateBrowser(profile, window_id, error);
     if (!browser)
       return NULL;
   }
 
   // Ensure the selected browser is tabbed.
   if (!browser->is_type_tabbed() && browser->IsAttemptingToCloseBrowser())
-    browser = chrome::FindTabbedBrowser(function->GetProfile(),
-                                        function->include_incognito());
+    browser = chrome::FindTabbedBrowser(profile, function->include_incognito());
   if (!browser || !browser->window()) {
     if (error)
       *error = keys::kNoCurrentWindowError;
     return NULL;
   }
 
   // TODO(jstritar): Add a constant, chrome.tabs.TAB_ID_ACTIVE, that
   // represents the active tab.
   WebContents* opener = NULL;
   if (params.opener_tab_id.get()) {
     int opener_id = *params.opener_tab_id;
 
-    if (!ExtensionTabUtil::GetTabById(opener_id,
-                                      function->GetProfile(),
-                                      function->include_incognito(),
-                                      NULL,
-                                      NULL,
-                                      &opener,
-                                      NULL)) {
+    if (!ExtensionTabUtil::GetTabById(opener_id, profile,
+                                      function->include_incognito(), NULL, NULL,
+                                      &opener, NULL)) {
       if (error) {
         *error = ErrorUtils::FormatErrorMessage(keys::kTabNotFoundError,
                                                 base::IntToString(opener_id));
       }
       return NULL;
     }
   }
 
   // TODO(rafaelw): handle setting remaining tab properties:
   // -title
@@ skipping 491 matching lines @@
   chrome::ShowSingletonTabOverwritingNTP(browser, params);
   return true;
 }
 
 // static
 bool ExtensionTabUtil::BrowserSupportsTabs(Browser* browser) {
   return browser && browser->tab_strip_model() && !browser->is_devtools();
 }
 
 }  // namespace extensions