Convert flash to thunk

ppapi/proxy/interface_list.cc

Index: ppapi/proxy/interface_list.cc
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index 4b526a0fe28cdbb228d0b3703728c9ecbdaeeece..22bbbfff2d65b4b0d38a053aacfc115c777e1305 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -174,6 +174,10 @@ InterfaceList::InterfaceList() {
   #include "ppapi/thunk/interfaces_ppb_public_dev.h"
   #include "ppapi/thunk/interfaces_ppb_private.h"
 
+  #if !defined(OS_NACL)
+  #include "ppapi/thunk/interfaces_ppb_private_flash.h"
+  #endif
+
   #undef PROXIED_API
   #undef PROXIED_IFACE
 
@@ -293,16 +297,6 @@ const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const {
 
 void InterfaceList::AddFlashInterfaces() {
 #if !defined(OS_NACL)
-  AddProxy(API_ID_PPB_FLASH, &ProxyFactory<PPB_Flash_Proxy>);
-  AddPPB(PPB_FLASH_INTERFACE_11_0, API_ID_PPB_FLASH,
-         PPB_Flash_Proxy::GetInterface11());
-  AddPPB(PPB_FLASH_INTERFACE_12_0, API_ID_PPB_FLASH,
-         PPB_Flash_Proxy::GetInterface12_0());
-  AddPPB(PPB_FLASH_INTERFACE_12_1, API_ID_PPB_FLASH,
-         PPB_Flash_Proxy::GetInterface12_1());
-  AddPPB(PPB_FLASH_INTERFACE_12_2, API_ID_PPB_FLASH,
-         PPB_Flash_Proxy::GetInterface12_2());
-
   AddProxy(API_ID_PPB_FLASH_CLIPBOARD,
            &ProxyFactory<PPB_Flash_Clipboard_Proxy>);
   AddPPB(PPB_FLASH_CLIPBOARD_INTERFACE_4_0, API_ID_PPB_FLASH_CLIPBOARD,