Remove an unused long in worker_messages.h.

The motivation is to remove longs in IPC messages, since they're not safe to send between 32 and 64 bit processes.

BUG=581409

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

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

14 files changed, 3 insertions, 18 deletions

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 96ed105..a3b2063 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -369,7 +369,6 @@ bool AwContentBrowserClient::AllowWorkerDatabase(
     const GURL& url,
     const base::string16& name,
     const base::string16& display_name,
-    unsigned long estimated_size,
     content::ResourceContext* context,
     const std::vector<std::pair<int, int> >& render_frames) {
   // Android WebView does not yet support web workers.
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h
index 0176866..5266f40 100644
--- a/android_webview/browser/aw_content_browser_client.h
+++ b/android_webview/browser/aw_content_browser_client.h
@@ -78,7 +78,6 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
       const GURL& url,
       const base::string16& name,
       const base::string16& display_name,
-      unsigned long estimated_size,
       content::ResourceContext* context,
       const std::vector<std::pair<int, int>>& render_frames) override;
   void AllowWorkerFileSystem(
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 194337d..48a5e9a 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1809,7 +1809,6 @@ bool ChromeContentBrowserClient::AllowWorkerDatabase(
     const GURL& url,
     const base::string16& name,
     const base::string16& display_name,
-    unsigned long estimated_size,
     content::ResourceContext* context,
     const std::vector<std::pair<int, int> >& render_frames) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 2a44654..f969305 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -152,7 +152,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       const GURL& url,
       const base::string16& name,
       const base::string16& display_name,
-      unsigned long estimated_size,
       content::ResourceContext* context,
       const std::vector<std::pair<int, int>>& render_frames) override;
   void AllowWorkerFileSystem(
diff --git a/content/browser/shared_worker/shared_worker_host.cc b/content/browser/shared_worker/shared_worker_host.cc
index 8aefff1..07d988f 100644
--- a/content/browser/shared_worker/shared_worker_host.cc
+++ b/content/browser/shared_worker/shared_worker_host.cc
@@ -184,7 +184,6 @@ void SharedWorkerHost::WorkerConnected(int message_port_id) {
 void SharedWorkerHost::AllowDatabase(const GURL& url,
                                      const base::string16& name,
                                      const base::string16& display_name,
-                                     unsigned long estimated_size,
                                      bool* result) {
   if (!instance_)
     return;
@@ -192,7 +191,6 @@ void SharedWorkerHost::AllowDatabase(const GURL& url,
       url,
       name,
       display_name,
-      estimated_size,
       instance_->resource_context(),
       GetRenderFrameIDsForWorker());
 }
diff --git a/content/browser/shared_worker/shared_worker_host.h b/content/browser/shared_worker/shared_worker_host.h
index 9fb9ca3..bbb1283 100644
--- a/content/browser/shared_worker/shared_worker_host.h
+++ b/content/browser/shared_worker/shared_worker_host.h
@@ -65,7 +65,6 @@ class SharedWorkerHost {
   void AllowDatabase(const GURL& url,
                      const base::string16& name,
                      const base::string16& display_name,
-                     unsigned long estimated_size,
                      bool* result);
   void AllowFileSystem(const GURL& url, scoped_ptr<IPC::Message> reply_msg);
   void AllowIndexedDB(const GURL& url,
diff --git a/content/browser/shared_worker/shared_worker_message_filter.cc b/content/browser/shared_worker/shared_worker_message_filter.cc
index 47902db..1c9fea1 100644
--- a/content/browser/shared_worker/shared_worker_message_filter.cc
+++ b/content/browser/shared_worker/shared_worker_message_filter.cc
@@ -148,13 +148,11 @@ void SharedWorkerMessageFilter::OnAllowDatabase(
     const GURL& url,
     const base::string16& name,
     const base::string16& display_name,
-    unsigned long estimated_size,
     bool* result) {
   SharedWorkerServiceImpl::GetInstance()->AllowDatabase(worker_route_id,
                                                         url,
                                                         name,
                                                         display_name,
-                                                        estimated_size,
                                                         result,
                                                         this);
 }
diff --git a/content/browser/shared_worker/shared_worker_message_filter.h b/content/browser/shared_worker/shared_worker_message_filter.h
index da0d32c..14f2707 100644
--- a/content/browser/shared_worker/shared_worker_message_filter.h
+++ b/content/browser/shared_worker/shared_worker_message_filter.h
@@ -59,7 +59,6 @@ class CONTENT_EXPORT SharedWorkerMessageFilter : public BrowserMessageFilter {
                        const GURL& url,
                        const base::string16& name,
                        const base::string16& display_name,
-                       unsigned long estimated_size,
                        bool* result);
   void OnRequestFileSystemAccess(int worker_route_id,
                                  const GURL& url,
diff --git a/content/browser/shared_worker/shared_worker_service_impl.cc b/content/browser/shared_worker/shared_worker_service_impl.cc
index 653eb11..b36187f 100644
--- a/content/browser/shared_worker/shared_worker_service_impl.cc
+++ b/content/browser/shared_worker/shared_worker_service_impl.cc
@@ -401,11 +401,10 @@ void SharedWorkerServiceImpl::AllowDatabase(
     const GURL& url,
     const base::string16& name,
     const base::string16& display_name,
-    unsigned long estimated_size,
     bool* result,
     SharedWorkerMessageFilter* filter) {
   if (SharedWorkerHost* host = FindSharedWorkerHost(filter, worker_route_id))
-    host->AllowDatabase(url, name, display_name, estimated_size, result);
+    host->AllowDatabase(url, name, display_name, result);
   else
     *result = false;
 }
diff --git a/content/browser/shared_worker/shared_worker_service_impl.h b/content/browser/shared_worker/shared_worker_service_impl.h
index 7b6bf85..d0e4ec3 100644
--- a/content/browser/shared_worker/shared_worker_service_impl.h
+++ b/content/browser/shared_worker/shared_worker_service_impl.h
@@ -74,7 +74,6 @@ class CONTENT_EXPORT SharedWorkerServiceImpl
                      const GURL& url,
                      const base::string16& name,
                      const base::string16& display_name,
-                     unsigned long estimated_size,
                      bool* result,
                      SharedWorkerMessageFilter* filter);
   void AllowFileSystem(int worker_route_id,
diff --git a/content/common/worker_messages.h b/content/common/worker_messages.h
index 60f1a4a..df86e79 100644
--- a/content/common/worker_messages.h
+++ b/content/common/worker_messages.h
@@ -57,12 +57,11 @@ IPC_MESSAGE_CONTROL1(WorkerProcessMsg_CreateWorker,
 
 // Sent by the worker process to check whether access to web databases is
 // allowed.
-IPC_SYNC_MESSAGE_CONTROL5_1(WorkerProcessHostMsg_AllowDatabase,
+IPC_SYNC_MESSAGE_CONTROL4_1(WorkerProcessHostMsg_AllowDatabase,
                             int /* worker_route_id */,
                             GURL /* origin url */,
                             base::string16 /* database name */,
                             base::string16 /* database display name */,
-                            unsigned long /* estimated size */,
                             bool /* result */)
 
 // Sent by the worker process to check whether access to file system is allowed.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 3f6d970..269aaee 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -188,7 +188,6 @@ bool ContentBrowserClient::AllowWorkerDatabase(
     const GURL& url,
     const base::string16& name,
     const base::string16& display_name,
-    unsigned long estimated_size,
     ResourceContext* context,
     const std::vector<std::pair<int, int> >& render_frames) {
   return true;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 5ecc56e..e64048a 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -377,7 +377,6 @@ class CONTENT_EXPORT ContentBrowserClient {
       const GURL& url,
       const base::string16& name,
       const base::string16& display_name,
-      unsigned long estimated_size,
       ResourceContext* context,
       const std::vector<std::pair<int, int> >& render_frames);
 
diff --git a/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.cc b/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.cc
index 1146363..ebeff78 100644
--- a/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.cc
+++ b/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.cc
@@ -35,7 +35,7 @@ bool EmbeddedSharedWorkerContentSettingsClientProxy::allowDatabase(
     return false;
   bool result = false;
   thread_safe_sender_->Send(new WorkerProcessHostMsg_AllowDatabase(
-      routing_id_, origin_url_, name, display_name, estimated_size, &result));
+      routing_id_, origin_url_, name, display_name, &result));
   return result;
 }