| Index: chrome/app/chrome_main_delegate.cc
|
| diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
|
| index e4fa69afd1d1bb9270ed1a9bc6beca0c7797c2a7..d3626f95f445575912282aef6fa8eb0c3c869917 100644
|
| --- a/chrome/app/chrome_main_delegate.cc
|
| +++ b/chrome/app/chrome_main_delegate.cc
|
| @@ -40,7 +40,6 @@
|
| #include "chrome/common/switch_utils.h"
|
| #include "chrome/common/trace_event_args_whitelist.h"
|
| #include "chrome/common/url_constants.h"
|
| -#include "chrome/plugin/chrome_content_plugin_client.h"
|
| #include "chrome/renderer/chrome_content_renderer_client.h"
|
| #include "chrome/utility/chrome_content_utility_client.h"
|
| #include "components/component_updater/component_updater_paths.h"
|
| @@ -145,8 +144,6 @@ base::LazyInstance<ChromeContentRendererClient>
|
| g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
|
| base::LazyInstance<ChromeContentUtilityClient>
|
| g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER;
|
| -base::LazyInstance<ChromeContentPluginClient>
|
| - g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
|
| #endif
|
|
|
| #if !defined(CHROME_MULTIPLE_DLL_CHILD)
|
| @@ -984,14 +981,6 @@ ChromeMainDelegate::CreateContentBrowserClient() {
|
| #endif
|
| }
|
|
|
| -content::ContentPluginClient* ChromeMainDelegate::CreateContentPluginClient() {
|
| -#if defined(CHROME_MULTIPLE_DLL_BROWSER)
|
| - return NULL;
|
| -#else
|
| - return g_chrome_content_plugin_client.Pointer();
|
| -#endif
|
| -}
|
| -
|
| content::ContentRendererClient*
|
| ChromeMainDelegate::CreateContentRendererClient() {
|
| #if defined(CHROME_MULTIPLE_DLL_BROWSER)
|
|
|