Commit ff18039b authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Give all different kFilteredMessages unique prefixes

There are 5 different kFilteredMessages arrays in content/browser
and some of them collide in jumbo (chromium unity builds)
build experiments.

This patch renames them to:
kCacheFilteredMessageClasses
kFileApiFilteredMessageClasses
kPepperFilteredMessageClasses
kRenderFilteredMessageClasses
kServiceWorkerFilteredMessageClasses

Bug: 746953
Change-Id: I3fc1b6f6ea3d0e5ccbb2ff47d4d476e02f5c2344
Reviewed-on: https://chromium-review.googlesource.com/721279Reviewed-by: default avatarKen Buchanan <kenrb@chromium.org>
Reviewed-by: default avatarMichael Nordman <michaeln@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#509321}
parent 1efe4d42
...@@ -32,7 +32,7 @@ namespace content { ...@@ -32,7 +32,7 @@ namespace content {
namespace { namespace {
const uint32_t kFilteredMessageClasses[] = {CacheStorageMsgStart}; const uint32_t kCacheFilteredMessageClasses[] = {CacheStorageMsgStart};
const int32_t kCachePreservationSeconds = 5; const int32_t kCachePreservationSeconds = 5;
blink::WebServiceWorkerCacheError ToWebServiceWorkerCacheError( blink::WebServiceWorkerCacheError ToWebServiceWorkerCacheError(
...@@ -70,8 +70,8 @@ void StopPreservingCache( ...@@ -70,8 +70,8 @@ void StopPreservingCache(
} // namespace } // namespace
CacheStorageDispatcherHost::CacheStorageDispatcherHost() CacheStorageDispatcherHost::CacheStorageDispatcherHost()
: BrowserMessageFilter(kFilteredMessageClasses, : BrowserMessageFilter(kCacheFilteredMessageClasses,
arraysize(kFilteredMessageClasses)) {} arraysize(kCacheFilteredMessageClasses)) {}
CacheStorageDispatcherHost::~CacheStorageDispatcherHost() { CacheStorageDispatcherHost::~CacheStorageDispatcherHost() {
} }
......
...@@ -54,7 +54,8 @@ namespace content { ...@@ -54,7 +54,8 @@ namespace content {
namespace { namespace {
const uint32_t kFilteredMessageClasses[] = {FileSystemMsgStart, BlobMsgStart}; const uint32_t kFileApiFilteredMessageClasses[] = {FileSystemMsgStart,
BlobMsgStart};
void RevokeFilePermission(int child_id, const base::FilePath& path) { void RevokeFilePermission(int child_id, const base::FilePath& path) {
ChildProcessSecurityPolicyImpl::GetInstance()->RevokeAllPermissionsForFile( ChildProcessSecurityPolicyImpl::GetInstance()->RevokeAllPermissionsForFile(
...@@ -68,8 +69,8 @@ FileAPIMessageFilter::FileAPIMessageFilter( ...@@ -68,8 +69,8 @@ FileAPIMessageFilter::FileAPIMessageFilter(
net::URLRequestContextGetter* request_context_getter, net::URLRequestContextGetter* request_context_getter,
storage::FileSystemContext* file_system_context, storage::FileSystemContext* file_system_context,
ChromeBlobStorageContext* blob_storage_context) ChromeBlobStorageContext* blob_storage_context)
: BrowserMessageFilter(kFilteredMessageClasses, : BrowserMessageFilter(kFileApiFilteredMessageClasses,
arraysize(kFilteredMessageClasses)), arraysize(kFileApiFilteredMessageClasses)),
process_id_(process_id), process_id_(process_id),
context_(file_system_context), context_(file_system_context),
security_policy_(ChildProcessSecurityPolicyImpl::GetInstance()), security_policy_(ChildProcessSecurityPolicyImpl::GetInstance()),
...@@ -86,8 +87,8 @@ FileAPIMessageFilter::FileAPIMessageFilter( ...@@ -86,8 +87,8 @@ FileAPIMessageFilter::FileAPIMessageFilter(
net::URLRequestContext* request_context, net::URLRequestContext* request_context,
storage::FileSystemContext* file_system_context, storage::FileSystemContext* file_system_context,
ChromeBlobStorageContext* blob_storage_context) ChromeBlobStorageContext* blob_storage_context)
: BrowserMessageFilter(kFilteredMessageClasses, : BrowserMessageFilter(kFileApiFilteredMessageClasses,
arraysize(kFilteredMessageClasses)), arraysize(kFileApiFilteredMessageClasses)),
process_id_(process_id), process_id_(process_id),
context_(file_system_context), context_(file_system_context),
security_policy_(ChildProcessSecurityPolicyImpl::GetInstance()), security_policy_(ChildProcessSecurityPolicyImpl::GetInstance()),
......
...@@ -30,7 +30,7 @@ namespace content { ...@@ -30,7 +30,7 @@ namespace content {
namespace { namespace {
const uint32_t kFilteredMessageClasses[] = { const uint32_t kPepperFilteredMessageClasses[] = {
PpapiMsgStart, FrameMsgStart, PpapiMsgStart, FrameMsgStart,
}; };
...@@ -94,8 +94,8 @@ PendingHostCreator::~PendingHostCreator() { ...@@ -94,8 +94,8 @@ PendingHostCreator::~PendingHostCreator() {
} // namespace } // namespace
PepperRendererConnection::PepperRendererConnection(int render_process_id) PepperRendererConnection::PepperRendererConnection(int render_process_id)
: BrowserMessageFilter(kFilteredMessageClasses, : BrowserMessageFilter(kPepperFilteredMessageClasses,
arraysize(kFilteredMessageClasses)), arraysize(kPepperFilteredMessageClasses)),
render_process_id_(render_process_id) { render_process_id_(render_process_id) {
// Only give the renderer permission for stable APIs. // Only give the renderer permission for stable APIs.
in_process_host_.reset(new BrowserPpapiHostImpl(this, in_process_host_.reset(new BrowserPpapiHostImpl(this,
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
namespace content { namespace content {
namespace { namespace {
const uint32_t kFilteredMessageClasses[] = { const uint32_t kRenderFilteredMessageClasses[] = {
ChildProcessMsgStart, RenderProcessMsgStart, ViewMsgStart, ChildProcessMsgStart, RenderProcessMsgStart, ViewMsgStart,
}; };
...@@ -124,8 +124,8 @@ RenderMessageFilter::RenderMessageFilter( ...@@ -124,8 +124,8 @@ RenderMessageFilter::RenderMessageFilter(
MediaInternals* media_internals, MediaInternals* media_internals,
DOMStorageContextWrapper* dom_storage_context, DOMStorageContextWrapper* dom_storage_context,
CacheStorageContextImpl* cache_storage_context) CacheStorageContextImpl* cache_storage_context)
: BrowserMessageFilter(kFilteredMessageClasses, : BrowserMessageFilter(kRenderFilteredMessageClasses,
arraysize(kFilteredMessageClasses)), arraysize(kRenderFilteredMessageClasses)),
BrowserAssociatedInterface<mojom::RenderMessageFilter>(this, this), BrowserAssociatedInterface<mojom::RenderMessageFilter>(this, this),
resource_dispatcher_host_(ResourceDispatcherHostImpl::Get()), resource_dispatcher_host_(ResourceDispatcherHostImpl::Get()),
request_context_(request_context), request_context_(request_context),
......
...@@ -64,7 +64,7 @@ const char kNoActiveWorkerErrorMessage[] = ...@@ -64,7 +64,7 @@ const char kNoActiveWorkerErrorMessage[] =
"The registration does not have an active worker."; "The registration does not have an active worker.";
const char kDatabaseErrorMessage[] = "Failed to access storage."; const char kDatabaseErrorMessage[] = "Failed to access storage.";
const uint32_t kFilteredMessageClasses[] = { const uint32_t kServiceWorkerFilteredMessageClasses[] = {
ServiceWorkerMsgStart, EmbeddedWorkerMsgStart, ServiceWorkerMsgStart, EmbeddedWorkerMsgStart,
}; };
...@@ -84,8 +84,8 @@ WebContents* GetWebContents(int render_process_id, int render_frame_id) { ...@@ -84,8 +84,8 @@ WebContents* GetWebContents(int render_process_id, int render_frame_id) {
ServiceWorkerDispatcherHost::ServiceWorkerDispatcherHost( ServiceWorkerDispatcherHost::ServiceWorkerDispatcherHost(
int render_process_id, int render_process_id,
ResourceContext* resource_context) ResourceContext* resource_context)
: BrowserMessageFilter(kFilteredMessageClasses, : BrowserMessageFilter(kServiceWorkerFilteredMessageClasses,
arraysize(kFilteredMessageClasses)), arraysize(kServiceWorkerFilteredMessageClasses)),
BrowserAssociatedInterface<mojom::ServiceWorkerDispatcherHost>(this, BrowserAssociatedInterface<mojom::ServiceWorkerDispatcherHost>(this,
this), this),
render_process_id_(render_process_id), render_process_id_(render_process_id),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment