Remove page id from extension's script execution callbacks.

BUG=371151
TEST=everything still works

Review URL: https://codereview.chromium.org/368723002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281073 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 5 insertions, 14 deletions

diff --git a/chrome/browser/extensions/api/execute_code_function.cc b/chrome/browser/extensions/api/execute_code_function.cc
index 848b862..81fc9b2 100644
--- a/chrome/browser/extensions/api/execute_code_function.cc
+++ b/chrome/browser/extensions/api/execute_code_function.cc
@@ -214,7 +214,6 @@ bool ExecuteCodeFunction::RunAsync() {
 
 void ExecuteCodeFunction::OnExecuteCodeFinished(
     const std::string& error,
-    int32 on_page_id,
     const GURL& on_url,
     const base::ListValue& result) {
   if (!error.empty())
diff --git a/chrome/browser/extensions/api/execute_code_function.h b/chrome/browser/extensions/api/execute_code_function.h
index da7e73d..d8d2fc5 100644
--- a/chrome/browser/extensions/api/execute_code_function.h
+++ b/chrome/browser/extensions/api/execute_code_function.h
@@ -33,7 +33,6 @@ class ExecuteCodeFunction : public ChromeAsyncExtensionFunction {
   virtual bool IsWebView() const = 0;
   virtual const GURL& GetWebViewSrc() const = 0;
   virtual void OnExecuteCodeFinished(const std::string& error,
-                                     int32 on_page_id,
                                      const GURL& on_url,
                                      const base::ListValue& result);
 
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index 8d895f3..a6695969 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -1225,7 +1225,6 @@ void TabsUpdateFunction::PopulateResult() {
 
 void TabsUpdateFunction::OnExecuteCodeFinished(
     const std::string& error,
-    int32 on_page_id,
     const GURL& url,
     const base::ListValue& script_result) {
   if (error.empty())
@@ -1700,13 +1699,11 @@ bool TabsExecuteScriptFunction::ShouldInsertCSS() const {
 
 void TabsExecuteScriptFunction::OnExecuteCodeFinished(
     const std::string& error,
-    int32 on_page_id,
     const GURL& on_url,
     const base::ListValue& result) {
   if (error.empty())
     SetResult(result.DeepCopy());
-  ExecuteCodeInTabFunction::OnExecuteCodeFinished(error, on_page_id, on_url,
-                                                  result);
+  ExecuteCodeInTabFunction::OnExecuteCodeFinished(error, on_url, result);
 }
 
 bool ExecuteCodeInTabFunction::Init() {
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.h b/chrome/browser/extensions/api/tabs/tabs_api.h
index 720b93c..fd45e37 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.h
+++ b/chrome/browser/extensions/api/tabs/tabs_api.h
@@ -150,7 +150,6 @@ class TabsUpdateFunction : public ChromeAsyncExtensionFunction {
  private:
   virtual bool RunAsync() OVERRIDE;
   void OnExecuteCodeFinished(const std::string& error,
-                             int32 on_page_id,
                              const GURL& on_url,
                              const base::ListValue& script_result);
 
@@ -240,7 +239,6 @@ class TabsExecuteScriptFunction : public ExecuteCodeInTabFunction {
 
   virtual void OnExecuteCodeFinished(
       const std::string& error,
-      int32 on_page_id,
       const GURL& on_url,
       const base::ListValue& script_result) OVERRIDE;
 
diff --git a/chrome/browser/extensions/api/web_view/web_view_internal_api.cc b/chrome/browser/extensions/api/web_view/web_view_internal_api.cc
index a3361f4..ac0e542 100644
--- a/chrome/browser/extensions/api/web_view/web_view_internal_api.cc
+++ b/chrome/browser/extensions/api/web_view/web_view_internal_api.cc
@@ -322,13 +322,12 @@ WebViewInternalExecuteScriptFunction::WebViewInternalExecuteScriptFunction() {
 
 void WebViewInternalExecuteScriptFunction::OnExecuteCodeFinished(
     const std::string& error,
-    int32 on_page_id,
     const GURL& on_url,
     const base::ListValue& result) {
   if (error.empty())
     SetResult(result.DeepCopy());
   WebViewInternalExecuteCodeFunction::OnExecuteCodeFinished(
-      error, on_page_id, on_url, result);
+      error, on_url, result);
 }
 
 WebViewInternalInsertCSSFunction::WebViewInternalInsertCSSFunction() {
diff --git a/chrome/browser/extensions/api/web_view/web_view_internal_api.h b/chrome/browser/extensions/api/web_view/web_view_internal_api.h
index 3ccf27d..4cf3e84 100644
--- a/chrome/browser/extensions/api/web_view/web_view_internal_api.h
+++ b/chrome/browser/extensions/api/web_view/web_view_internal_api.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_API_WEBVIEW_WEB_VIEW_INTERNRAL_API_H_
-#define CHROME_BROWSER_EXTENSIONS_API_WEBVIEW_WEB_VIEW_INTERNRAL_API_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_WEB_VIEW_WEB_VIEW_INTERNAL_API_H_
+#define CHROME_BROWSER_EXTENSIONS_API_WEB_VIEW_WEB_VIEW_INTERNAL_API_H_
 
 #include "chrome/browser/extensions/api/capture_web_contents_function.h"
 #include "chrome/browser/extensions/api/execute_code_function.h"
@@ -186,7 +186,6 @@ class WebViewInternalExecuteScriptFunction
   virtual ~WebViewInternalExecuteScriptFunction() {}
 
   virtual void OnExecuteCodeFinished(const std::string& error,
-                                     int32 on_page_id,
                                      const GURL& on_url,
                                      const base::ListValue& result) OVERRIDE;
 
@@ -440,4 +439,4 @@ class WebViewInternalTerminateFunction
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_API_WEBVIEW_WEB_VIEW_INTERNRAL_API_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_API_WEB_VIEW_WEB_VIEW_INTERNAL_API_H_