| Index: content/browser/plugin_service_impl.cc
|
| diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
|
| index fa21c7d61491ed634706df8ba881793ef362d858..dabd26dfae7aedbaee98692c6f7ba9dca78dfc60 100644
|
| --- a/content/browser/plugin_service_impl.cc
|
| +++ b/content/browser/plugin_service_impl.cc
|
| @@ -268,7 +268,6 @@ PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess(
|
| const FilePath& plugin_path,
|
| const FilePath& profile_data_directory,
|
| PpapiPluginProcessHost::PluginClient* client) {
|
| -#if defined(ENABLE_PLUGINS)
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| PpapiPluginProcessHost* plugin_host =
|
| @@ -285,9 +284,6 @@ PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess(
|
| return PpapiPluginProcessHost::CreatePluginHost(
|
| *info, profile_data_directory,
|
| client->GetResourceContext()->GetHostResolver());
|
| -#else
|
| - return NULL;
|
| -#endif
|
| }
|
|
|
| PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiBrokerProcess(
|
| @@ -350,7 +346,6 @@ void PluginServiceImpl::OpenChannelToPpapiPlugin(
|
| void PluginServiceImpl::OpenChannelToPpapiBroker(
|
| const FilePath& path,
|
| PpapiPluginProcessHost::BrokerClient* client) {
|
| -#if defined(ENABLE_PLUGINS)
|
| PpapiPluginProcessHost* plugin_host = FindOrStartPpapiBrokerProcess(path);
|
| if (plugin_host) {
|
| plugin_host->OpenChannelToPlugin(client);
|
| @@ -358,7 +353,6 @@ void PluginServiceImpl::OpenChannelToPpapiBroker(
|
| // Send error.
|
| client->OnPpapiChannelOpened(IPC::ChannelHandle(), 0);
|
| }
|
| -#endif
|
| }
|
|
|
| void PluginServiceImpl::CancelOpenChannelToNpapiPlugin(
|
|
|