Commit 9f85aba0 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Gave two BindConnectorRequest methods unique names

In jumbo builds, many cc files share the same anonymous namespace
since they are compiled in the same translation unit. Then
methods that would otherwise not clash cause symbol collisions.

This patch renames two identical BindConnectorRequest methods.
A better fix may be to find a shared location but there is no
obvious shared location between media/casting and pepper/flash.

Bug: 746957
Change-Id: I80b4806140720824fefd1d0019537b6fd89683da
Reviewed-on: https://chromium-review.googlesource.com/878363Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532181}
parent 1fb51f7a
...@@ -105,7 +105,7 @@ class RtcpClient : public media::cast::RtcpObserver { ...@@ -105,7 +105,7 @@ class RtcpClient : public media::cast::RtcpObserver {
DISALLOW_COPY_AND_ASSIGN(RtcpClient); DISALLOW_COPY_AND_ASSIGN(RtcpClient);
}; };
void BindConnectorRequest( void CastBindConnectorRequest(
service_manager::mojom::ConnectorRequest connector_request) { service_manager::mojom::ConnectorRequest connector_request) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(content::ServiceManagerConnection::GetForProcess()); DCHECK(content::ServiceManagerConnection::GetForProcess());
...@@ -412,7 +412,7 @@ device::mojom::WakeLock* CastTransportHostFilter::GetWakeLock() { ...@@ -412,7 +412,7 @@ device::mojom::WakeLock* CastTransportHostFilter::GetWakeLock() {
auto connector = service_manager::Connector::Create(&connector_request); auto connector = service_manager::Connector::Create(&connector_request);
content::BrowserThread::PostTask( content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE, content::BrowserThread::UI, FROM_HERE,
base::BindOnce(&BindConnectorRequest, std::move(connector_request))); base::BindOnce(&CastBindConnectorRequest, std::move(connector_request)));
device::mojom::WakeLockProviderPtr wake_lock_provider; device::mojom::WakeLockProviderPtr wake_lock_provider;
connector->BindInterface(device::mojom::kServiceName, connector->BindInterface(device::mojom::kServiceName,
......
...@@ -54,7 +54,7 @@ scoped_refptr<content_settings::CookieSettings> GetCookieSettings( ...@@ -54,7 +54,7 @@ scoped_refptr<content_settings::CookieSettings> GetCookieSettings(
return NULL; return NULL;
} }
void BindConnectorRequest( void PepperBindConnectorRequest(
service_manager::mojom::ConnectorRequest connector_request) { service_manager::mojom::ConnectorRequest connector_request) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(ServiceManagerConnection::GetForProcess()); DCHECK(ServiceManagerConnection::GetForProcess());
...@@ -194,9 +194,9 @@ device::mojom::WakeLock* PepperFlashBrowserHost::GetWakeLock() { ...@@ -194,9 +194,9 @@ device::mojom::WakeLock* PepperFlashBrowserHost::GetWakeLock() {
// The existing connector is bound to the UI thread, the current thread is // The existing connector is bound to the UI thread, the current thread is
// IO thread. So bind the ConnectorRequest of IO thread to the connector // IO thread. So bind the ConnectorRequest of IO thread to the connector
// in UI thread. // in UI thread.
BrowserThread::PostTask( BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
BrowserThread::UI, FROM_HERE, base::BindOnce(&PepperBindConnectorRequest,
base::BindOnce(&BindConnectorRequest, std::move(connector_request))); std::move(connector_request)));
device::mojom::WakeLockProviderPtr wake_lock_provider; device::mojom::WakeLockProviderPtr wake_lock_provider;
connector->BindInterface(device::mojom::kServiceName, connector->BindInterface(device::mojom::kServiceName,
......
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