Refactor the way singleton-style resources are exposed via PPB_Instance

ppapi/thunk/ppb_flash_clipboard_thunk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash_clipboard.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_flash_clipboard_api.h"
 #include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
 
 namespace {
 
 uint32_t RegisterCustomFormat(PP_Instance instance,
                               const char* format_name) {
-  EnterInstance enter(instance);
+  EnterInstanceAPI<PPB_Flash_Clipboard_API> enter(instance,
+                                                  FLASH_CLIPBOARD_SINGLETON_ID);

[raymes, 2012/11/20 21:14:59]

Note that we could make this even easier by associating the SingletonID with the
API (e.g. PPB_Flash_Clipboard_API::kSingletonID) and then EnterInstanceAPI could
automatically grab it. Let me know your thoughts on this.

[raymes, 2012/11/20 23:30:23]

Done.

   if (enter.failed())
     return PP_FALSE;
-  return enter.functions()->GetFlashClipboardAPI(
-      instance)->RegisterCustomFormat(instance, format_name);
+  return enter.functions()->RegisterCustomFormat(instance, format_name);
 }
 
 PP_Bool IsFormatAvailable(PP_Instance instance,
                           PP_Flash_Clipboard_Type clipboard_type,
                           uint32_t format) {
-  EnterInstance enter(instance);
+  EnterInstanceAPI<PPB_Flash_Clipboard_API> enter(instance,
+                                                  FLASH_CLIPBOARD_SINGLETON_ID);
   if (enter.failed())
     return PP_FALSE;
-  return enter.functions()->GetFlashClipboardAPI(
-      instance)->IsFormatAvailable(instance, clipboard_type, format);
+  return enter.functions()->IsFormatAvailable(instance, clipboard_type, format);
 }
 
 PP_Var ReadData(PP_Instance instance,
                 PP_Flash_Clipboard_Type clipboard_type,
                 uint32_t format) {
-  EnterInstance enter(instance);
+  EnterInstanceAPI<PPB_Flash_Clipboard_API> enter(instance,
+                                                  FLASH_CLIPBOARD_SINGLETON_ID);
   if (enter.failed())
     return PP_MakeUndefined();
-  return enter.functions()->GetFlashClipboardAPI(instance)->ReadData(
-      instance, clipboard_type, format);
+  return enter.functions()->ReadData(instance, clipboard_type, format);
 }
 
 int32_t WriteData(PP_Instance instance,
                   PP_Flash_Clipboard_Type clipboard_type,
                   uint32_t data_item_count,
                   const uint32_t formats[],
                   const PP_Var data_items[]) {
-  EnterInstance enter(instance);
+  EnterInstanceAPI<PPB_Flash_Clipboard_API> enter(instance,
+                                                  FLASH_CLIPBOARD_SINGLETON_ID);
   if (enter.failed())
     return enter.retval();
-  return enter.functions()->GetFlashClipboardAPI(instance)->WriteData(
+  return enter.functions()->WriteData(
       instance, clipboard_type, data_item_count, formats, data_items);
 }
 
 PP_Bool IsFormatAvailable_4_0(PP_Instance instance,
                               PP_Flash_Clipboard_Type clipboard_type,
                               PP_Flash_Clipboard_Format format) {
   return IsFormatAvailable(instance, clipboard_type,
                            static_cast<uint32_t>(format));
 }
 
@@ skipping 33 matching lines @@
 const PPB_Flash_Clipboard_4_0* GetPPB_Flash_Clipboard_4_0_Thunk() {
   return &g_ppb_flash_clipboard_thunk_4_0;
 }
 
 const PPB_Flash_Clipboard_5_0* GetPPB_Flash_Clipboard_5_0_Thunk() {
   return &g_ppb_flash_clipboard_thunk_5_0;
 }
 
 }  // namespace thunk
 }  // namespace ppapi