The chrome browser target should not depend on plugins.

webkit/plugins/ppapi/plugin_module.cc

Index: webkit/plugins/ppapi/plugin_module.cc
===================================================================
--- webkit/plugins/ppapi/plugin_module.cc	(revision 201591)
+++ webkit/plugins/ppapi/plugin_module.cc	(working copy)
@@ -308,53 +308,14 @@
   #undef UNPROXIED_API
   #undef PROXIED_IFACE
 
-  // Please keep alphabetized by interface macro name with "special" stuff at
-  // the bottom.
-  if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE_0_6) == 0)
-    return ::ppapi::thunk::GetPPB_AudioTrusted_0_6_Thunk();
-  if (strcmp(name, PPB_BUFFER_TRUSTED_INTERFACE_0_1) == 0)
-    return ::ppapi::thunk::GetPPB_BufferTrusted_0_1_Thunk();
-  if (strcmp(name, PPB_CORE_INTERFACE_1_0) == 0)
-    return &core_interface;
-  if (strcmp(name, PPB_GPUBLACKLIST_PRIVATE_INTERFACE) == 0)
-    return PPB_GpuBlacklist_Private_Impl::GetInterface();
-  if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE_1_0) == 0)
-    return ::ppapi::thunk::GetPPB_Graphics3DTrusted_1_0_Thunk();
-  if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE_0_4) == 0)
-    return ::ppapi::thunk::GetPPB_ImageDataTrusted_0_4_Thunk();
-  if (strcmp(name, PPB_INPUT_EVENT_INTERFACE_1_0) == 0)
-    return ::ppapi::thunk::GetPPB_InputEvent_1_0_Thunk();
-  if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE_0_1) == 0)
-    return ::ppapi::thunk::GetPPB_Instance_Private_0_1_Thunk();
-  if (strcmp(name, PPB_OPENGLES2_INTERFACE) == 0)
-    return ::ppapi::PPB_OpenGLES2_Shared::GetInterface();
-  if (strcmp(name, PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE) == 0)
-    return ::ppapi::PPB_OpenGLES2_Shared::GetInstancedArraysInterface();
-  if (strcmp(name, PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE) == 0)
-    return ::ppapi::PPB_OpenGLES2_Shared::GetFramebufferBlitInterface();
-  if (strcmp(name, PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE) == 0)
-    return ::ppapi::PPB_OpenGLES2_Shared::GetFramebufferMultisampleInterface();
-  if (strcmp(name, PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE) == 0)
-    return ::ppapi::PPB_OpenGLES2_Shared::GetChromiumEnableFeatureInterface();
-  if (strcmp(name, PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE) == 0)
-    return ::ppapi::PPB_OpenGLES2_Shared::GetChromiumMapSubInterface();
-  if (strcmp(name, PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0) == 0)
-    return ::ppapi::PPB_OpenGLES2_Shared::GetChromiumMapSubInterface();
-  if (strcmp(name, PPB_OPENGLES2_QUERY_INTERFACE) == 0)
-    return ::ppapi::PPB_OpenGLES2_Shared::GetQueryInterface();
-  if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0)
-    return PPB_Proxy_Impl::GetInterface();
-  if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0)
-    return PPB_UMA_Private_Impl::GetInterface();
-  if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0)
-    return PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface();
-  if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0)
-    return ::ppapi::PPB_Var_Shared::GetVarInterface1_0();
-  if (strcmp(name, PPB_VAR_INTERFACE_1_1) == 0)
-    return ::ppapi::PPB_Var_Shared::GetVarInterface1_1();
-  if (strcmp(name, PPB_VAR_ARRAY_BUFFER_INTERFACE_1_0) == 0)
-    return ::ppapi::PPB_Var_Shared::GetVarArrayBufferInterface1_0();
+  #define LEGACY_IFACE(iface_str, function_name) \
+      if (strcmp(name, iface_str) == 0) \
+        return function_name;
 
+  #include "ppapi/thunk/interfaces_legacy.h"
+
+  #undef LEGACY_IFACE
+
   // Only support the testing interface when the command line switch is
   // specified. This allows us to prevent people from (ab)using this interface
   // in production code.