[Extensions] Isolate ExtensionFunction results_ and error_

chrome/browser/extensions/api/tabs/tabs_api.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/api/tabs/tabs_api.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <limits>
 #include <memory>
@@ skipping 1349 matching lines @@
             HostID(HostID::EXTENSIONS, extension_id()),
             ScriptExecutor::JAVASCRIPT,
             net::UnescapeURLComponent(
                 url.GetContent(),
                 net::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS |
                     net::UnescapeRule::PATH_SEPARATORS |
                     net::UnescapeRule::SPACES),
             ScriptExecutor::SINGLE_FRAME, ExtensionApiFrameIdMap::kTopFrameId,
             ScriptExecutor::DONT_MATCH_ABOUT_BLANK, UserScript::DOCUMENT_IDLE,
             ScriptExecutor::MAIN_WORLD, ScriptExecutor::DEFAULT_PROCESS, GURL(),
-            GURL(), user_gesture_, ScriptExecutor::NO_RESULT,
+            GURL(), user_gesture(), ScriptExecutor::NO_RESULT,
             base::Bind(&TabsUpdateFunction::OnExecuteCodeFinished, this));
 
     *is_async = true;
     return true;
   }
 
   web_contents_->GetController().LoadURL(
       url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
 
   // The URL of a tab contents never actually changes to a JavaScript URL, so
@@ skipping 775 matching lines @@
       tabs::Discard::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   WebContents* contents = nullptr;
   Profile* profile = Profile::FromBrowserContext(browser_context());
   // If |tab_id| is given, find the web_contents respective to it.
   // Otherwise invoke discard function in TabManager with null web_contents
   // that will discard the least important tab.
   if (params->tab_id) {
     int tab_id = *params->tab_id;
+    std::string error;
     if (!GetTabById(tab_id, profile, include_incognito(), nullptr, nullptr,
-                    &contents, nullptr, &error_)) {
-      return RespondNow(Error(error_));
+                    &contents, nullptr, &error)) {
+      return RespondNow(Error(error));
     }
   }
   // Discard the tab.
   contents =
       g_browser_process->GetTabManager()->DiscardTabByExtension(contents);
 
   // Create the Tab object and return it in case of success.
   if (contents) {
     return RespondNow(ArgumentList(tabs::Discard::Results::Create(
         *ExtensionTabUtil::CreateTabObject(contents))));
   }
 
   // Return appropriate error message otherwise.
   return RespondNow(Error(
       params->tab_id
           ? ErrorUtils::FormatErrorMessage(keys::kCannotDiscardTab,
                                            base::IntToString(*params->tab_id))
           : keys::kCannotFindTabToDiscard));
 }
 
 TabsDiscardFunction::TabsDiscardFunction() {}
 TabsDiscardFunction::~TabsDiscardFunction() {}
 
 }  // namespace extensions