Remove unused process_id parameter from permissions_data

The process ID was introduced in crbug.com/220039, and used to protect
the signin process, but this special process was removed as a part of
crbug.com/350202.

There are no other uses for the process ID, so remove it.

BUG=379356
TEST=still compiles

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

Cr-Commit-Position: refs/heads/master@{#371282}

13 files changed, 42 insertions, 51 deletions

diff --git a/chrome/browser/extensions/active_script_controller.cc b/chrome/browser/extensions/active_script_controller.cc
index 4970de2..2ab86db 100644
--- a/chrome/browser/extensions/active_script_controller.cc
+++ b/chrome/browser/extensions/active_script_controller.cc
@@ -89,10 +89,10 @@ ActiveScriptController::RequiresUserConsentForScriptInjection(
   switch (type) {
     case UserScript::CONTENT_SCRIPT:
       return extension->permissions_data()->GetContentScriptAccess(
-          extension, url, tab_id, -1, NULL);
+          extension, url, tab_id, nullptr);
     case UserScript::PROGRAMMATIC_SCRIPT:
-      return extension->permissions_data()->GetPageAccess(
-          extension, url, tab_id, -1, NULL);
+      return extension->permissions_data()->GetPageAccess(extension, url,
+                                                          tab_id, nullptr);
   }
 
   NOTREACHED();
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index 53d270a..70bfa17 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -109,8 +109,8 @@ class ActiveTabTest : public ChromeRenderViewHostTestHarness {
                  PermittedFeature feature,
                  int tab_id) {
     const PermissionsData* permissions_data = extension->permissions_data();
-    bool script = permissions_data->CanAccessPage(
-        extension.get(), url, tab_id, -1, NULL);
+    bool script =
+        permissions_data->CanAccessPage(extension.get(), url, tab_id, nullptr);
     bool capture = HasTabsPermission(extension, tab_id) &&
                    permissions_data->CanCaptureVisiblePage(tab_id, NULL);
     switch (feature) {
diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
index 8e99701..1770ca5 100644
--- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
+++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
@@ -27,7 +27,6 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_plugin_guest_manager.h"
 #include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ -148,11 +147,9 @@ bool CanRequestAutomation(const Extension* extension,
     return true;
 
   int tab_id = ExtensionTabUtil::GetTabId(contents);
-  content::RenderProcessHost* process = contents->GetRenderProcessHost();
-  int process_id = process ? process->GetID() : -1;
   std::string unused_error;
-  return extension->permissions_data()->CanAccessPage(
-      extension, url, tab_id, process_id, &unused_error);
+  return extension->permissions_data()->CanAccessPage(extension, url, tab_id,
+                                                      &unused_error);
 }
 
 // Helper class that implements an action adapter for a |RenderFrameHost|.
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index 9615815..6924b10 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -67,7 +67,6 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
@@ -1345,12 +1344,10 @@ bool TabsUpdateFunction::UpdateURL(const std::string &url_string,
   // JavaScript URLs can do the same kinds of things as cross-origin XHR, so
   // we need to check host permissions before allowing them.
   if (url.SchemeIs(url::kJavaScriptScheme)) {
-    content::RenderProcessHost* process = web_contents_->GetRenderProcessHost();
     if (!extension()->permissions_data()->CanAccessPage(
             extension(),
             web_contents_->GetURL(),
             tab_id,
-            process ? process->GetID() : -1,
             &error_)) {
       return false;
     }
@@ -1866,12 +1863,10 @@ bool ExecuteCodeInTabFunction::CanExecuteScriptOnPage() {
 
   // NOTE: This can give the wrong answer due to race conditions, but it is OK,
   // we check again in the renderer.
-  content::RenderProcessHost* process = contents->GetRenderProcessHost();
   if (!extension()->permissions_data()->CanAccessPage(
           extension(),
           contents->GetURL(),
           execute_tab_id_,
-          process ? process->GetID() : -1,
           &error_)) {
     return false;
   }
diff --git a/chrome/browser/extensions/browser_permissions_policy_delegate.cc b/chrome/browser/extensions/browser_permissions_policy_delegate.cc
index 2bd874a..6a2cd0d 100644
--- a/chrome/browser/extensions/browser_permissions_policy_delegate.cc
+++ b/chrome/browser/extensions/browser_permissions_policy_delegate.cc
@@ -25,7 +25,6 @@ bool BrowserPermissionsPolicyDelegate::CanExecuteScriptOnPage(
     const Extension* extension,
     const GURL& document_url,
     int tab_id,
-    int process_id,
     std::string* error) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   return true;
diff --git a/chrome/browser/extensions/browser_permissions_policy_delegate.h b/chrome/browser/extensions/browser_permissions_policy_delegate.h
index a856082..a9a647b3 100644
--- a/chrome/browser/extensions/browser_permissions_policy_delegate.h
+++ b/chrome/browser/extensions/browser_permissions_policy_delegate.h
@@ -20,7 +20,6 @@ class BrowserPermissionsPolicyDelegate
   bool CanExecuteScriptOnPage(const Extension* extension,
                               const GURL& document_url,
                               int tab_id,
-                              int process_id,
                               std::string* error) override;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPermissionsPolicyDelegate);
diff --git a/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc b/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc
index e1e8e64..55add1c 100644
--- a/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc
+++ b/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc
@@ -310,8 +310,7 @@ TEST_F(ScriptingPermissionsModifierUnitTest, GrantHostPermission) {
 
   const PermissionsData* permissions = extension->permissions_data();
   auto get_page_access = [&permissions, &extension](const GURL& url) {
-    return permissions->GetPageAccess(extension.get(), url, 0 /* tab id */,
-                                      0 /* process id */, nullptr /* error */);
+    return permissions->GetPageAccess(extension.get(), url, 0, nullptr);
   };
 
   EXPECT_EQ(PermissionsData::ACCESS_WITHHELD, get_page_access(kUrl));
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc
index eb5d088..57d7d6b 100644
--- a/chrome/common/extensions/extension_unittest.cc
+++ b/chrome/common/extensions/extension_unittest.cc
@@ -245,69 +245,69 @@ TEST(ExtensionTest, WantsFileAccess) {
   extension = LoadManifest("permissions", "permissions_all_urls.json");
   EXPECT_TRUE(extension->wants_file_access());
   EXPECT_FALSE(extension->permissions_data()->CanAccessPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
   extension = LoadManifest(
       "permissions", "permissions_all_urls.json", Extension::ALLOW_FILE_ACCESS);
   EXPECT_TRUE(extension->wants_file_access());
   EXPECT_TRUE(extension->permissions_data()->CanAccessPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
 
   // file:///* permission
   extension = LoadManifest("permissions", "permissions_file_scheme.json");
   EXPECT_TRUE(extension->wants_file_access());
   EXPECT_FALSE(extension->permissions_data()->CanAccessPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
   extension = LoadManifest("permissions",
                            "permissions_file_scheme.json",
                            Extension::ALLOW_FILE_ACCESS);
   EXPECT_TRUE(extension->wants_file_access());
   EXPECT_TRUE(extension->permissions_data()->CanAccessPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
 
   // http://* permission
   extension = LoadManifest("permissions", "permissions_http_scheme.json");
   EXPECT_FALSE(extension->wants_file_access());
   EXPECT_FALSE(extension->permissions_data()->CanAccessPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
   extension = LoadManifest("permissions",
                            "permissions_http_scheme.json",
                            Extension::ALLOW_FILE_ACCESS);
   EXPECT_FALSE(extension->wants_file_access());
   EXPECT_FALSE(extension->permissions_data()->CanAccessPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
 
   // <all_urls> content script match
   extension = LoadManifest("permissions", "content_script_all_urls.json");
   EXPECT_TRUE(extension->wants_file_access());
   EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
   extension = LoadManifest("permissions", "content_script_all_urls.json",
       Extension::ALLOW_FILE_ACCESS);
   EXPECT_TRUE(extension->wants_file_access());
   EXPECT_TRUE(extension->permissions_data()->CanRunContentScriptOnPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
 
   // file:///* content script match
   extension = LoadManifest("permissions", "content_script_file_scheme.json");
   EXPECT_TRUE(extension->wants_file_access());
   EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
   extension = LoadManifest("permissions", "content_script_file_scheme.json",
       Extension::ALLOW_FILE_ACCESS);
   EXPECT_TRUE(extension->wants_file_access());
   EXPECT_TRUE(extension->permissions_data()->CanRunContentScriptOnPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
 
   // http://* content script match
   extension = LoadManifest("permissions", "content_script_http_scheme.json");
   EXPECT_FALSE(extension->wants_file_access());
   EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
   extension = LoadManifest("permissions", "content_script_http_scheme.json",
       Extension::ALLOW_FILE_ACCESS);
   EXPECT_FALSE(extension->wants_file_access());
   EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(
-      extension.get(), file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, nullptr));
 }
 
 TEST(ExtensionTest, ExtraFlags) {
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc
index 8cc795b..00ca695 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc
@@ -37,7 +37,8 @@ TEST_F(ChromePermissionManifestTest, ChromeURLPermissionAllowedWithFlag) {
   EXPECT_EQ("", error);
   const GURL newtab_url(chrome::kChromeUINewTabURL);
   EXPECT_TRUE(extension->permissions_data()->CanAccessPage(
-      extension.get(), newtab_url, 0, -1, &error)) << error;
+      extension.get(), newtab_url, 0, &error))
+      << error;
 }
 
 TEST_F(ChromePermissionManifestTest,
diff --git a/chrome/common/extensions/permissions/permissions_data_unittest.cc b/chrome/common/extensions/permissions/permissions_data_unittest.cc
index 22ac1e8..f2fe4a6 100644
--- a/chrome/common/extensions/permissions/permissions_data_unittest.cc
+++ b/chrome/common/extensions/permissions/permissions_data_unittest.cc
@@ -415,13 +415,13 @@ class ExtensionScriptAndCaptureVisibleTest : public testing::Test {
   }
 
   bool AllowedScript(const Extension* extension, const GURL& url, int tab_id) {
-    return extension->permissions_data()->CanAccessPage(
-        extension, url, tab_id, -1, NULL);
+    return extension->permissions_data()->CanAccessPage(extension, url, tab_id,
+                                                        nullptr);
   }
 
   bool BlockedScript(const Extension* extension, const GURL& url) {
-    return !extension->permissions_data()->CanAccessPage(
-        extension, url, -1, -1, NULL);
+    return !extension->permissions_data()->CanAccessPage(extension, url, -1,
+                                                         nullptr);
   }
 
   bool Allowed(const Extension* extension, const GURL& url) {
@@ -429,8 +429,8 @@ class ExtensionScriptAndCaptureVisibleTest : public testing::Test {
   }
 
   bool Allowed(const Extension* extension, const GURL& url, int tab_id) {
-    return (extension->permissions_data()->CanAccessPage(
-                extension, url, tab_id, -1, NULL) &&
+    return (extension->permissions_data()->CanAccessPage(extension, url, tab_id,
+                                                         nullptr) &&
             extension->permissions_data()->CanCaptureVisiblePage(tab_id, NULL));
   }
 
@@ -439,9 +439,10 @@ class ExtensionScriptAndCaptureVisibleTest : public testing::Test {
   }
 
   bool CaptureOnly(const Extension* extension, const GURL& url, int tab_id) {
-    return !extension->permissions_data()->CanAccessPage(
-               extension, url, tab_id, -1, NULL) &&
-           extension->permissions_data()->CanCaptureVisiblePage(tab_id, NULL);
+    return !extension->permissions_data()->CanAccessPage(extension, url, tab_id,
+                                                         nullptr) &&
+           extension->permissions_data()->CanCaptureVisiblePage(tab_id,
+                                                                nullptr);
   }
 
   bool ScriptOnly(const Extension* extension, const GURL& url) {
@@ -450,7 +451,8 @@ class ExtensionScriptAndCaptureVisibleTest : public testing::Test {
 
   bool ScriptOnly(const Extension* extension, const GURL& url, int tab_id) {
     return AllowedScript(extension, url, tab_id) &&
-           !extension->permissions_data()->CanCaptureVisiblePage(tab_id, NULL);
+           !extension->permissions_data()->CanCaptureVisiblePage(tab_id,
+                                                                 nullptr);
   }
 
   bool Blocked(const Extension* extension, const GURL& url) {
@@ -458,10 +460,10 @@ class ExtensionScriptAndCaptureVisibleTest : public testing::Test {
   }
 
   bool Blocked(const Extension* extension, const GURL& url, int tab_id) {
-    return !(extension->permissions_data()->CanAccessPage(
-                 extension, url, tab_id, -1, NULL) ||
-             extension->permissions_data()->CanCaptureVisiblePage(tab_id,
-                                                                  NULL));
+    return !extension->permissions_data()->CanAccessPage(extension, url, tab_id,
+                                                         nullptr) &&
+           !extension->permissions_data()->CanCaptureVisiblePage(tab_id,
+                                                                 nullptr);
   }
 
   bool ScriptAllowedExclusivelyOnTab(
diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc b/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
index 11f92be..240da30 100644
--- a/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
+++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
@@ -27,7 +27,6 @@ bool RendererPermissionsPolicyDelegate::CanExecuteScriptOnPage(
     const Extension* extension,
     const GURL& document_url,
     int tab_id,
-    int process_id,
     std::string* error) {
   if (PermissionsData::CanExecuteScriptEverywhere(extension))
     return true;
diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate.h b/chrome/renderer/extensions/renderer_permissions_policy_delegate.h
index 3c82509..24587f1 100644
--- a/chrome/renderer/extensions/renderer_permissions_policy_delegate.h
+++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate.h
@@ -22,7 +22,6 @@ class RendererPermissionsPolicyDelegate
   bool CanExecuteScriptOnPage(const Extension* extension,
                               const GURL& document_url,
                               int tab_id,
-                              int process_id,
                               std::string* error) override;
 
  private:
diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc b/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc
index e390607..1aa453c 100644
--- a/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc
+++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc
@@ -70,8 +70,9 @@ TEST_F(RendererPermissionsPolicyDelegateTest, CannotScriptWebstore) {
   scoped_refptr<const Extension> extension(CreateTestExtension("a"));
   std::string error;
 
-  EXPECT_TRUE(extension->permissions_data()->CanAccessPage(
-      extension.get(), kAnyUrl, -1, -1, &error)) << error;
+  EXPECT_TRUE(extension->permissions_data()->CanAccessPage(extension.get(),
+                                                           kAnyUrl, -1, &error))
+      << error;
 
   // Pretend we are in the webstore process. We should not be able to execute
   // script.
@@ -80,7 +81,7 @@ TEST_F(RendererPermissionsPolicyDelegateTest, CannotScriptWebstore) {
   RendererExtensionRegistry::Get()->Insert(webstore_extension.get());
   extension_dispatcher_->OnActivateExtension(extensions::kWebStoreAppId);
   EXPECT_FALSE(extension->permissions_data()->CanAccessPage(
-      extension.get(), kAnyUrl, -1, -1, &error))
+      extension.get(), kAnyUrl, -1, &error))
       << error;
 }