Refactored PPB_Flash GetSettings to the new pepper resource model

ppapi/thunk/ppb_flash_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/logging.h"
 #include "ppapi/c/pp_array_output.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
@@ skipping 43 matching lines @@
   return enter.functions()->GetProxyForURL(instance, url);
 }
 
 int32_t Navigate(PP_Resource request_id,
                  const char* target,
                  PP_Bool from_user_action) {
   // TODO(brettw): this function should take an instance.
   // To work around this, use the PP_Instance from the resource.
   PP_Instance instance;
   {
-    thunk::EnterResource<thunk::PPB_URLRequestInfo_API> enter(request_id, true);
+    EnterResource<PPB_URLRequestInfo_API> enter(request_id, true);
     if (enter.failed())
       return PP_ERROR_BADRESOURCE;
     instance = enter.resource()->pp_instance();
   }
 
   EnterInstance enter(instance);
   if (enter.failed())
     return PP_ERROR_BADARGUMENT;
   return enter.functions()->GetFlashAPI()->Navigate(instance, request_id,
                                                     target, from_user_action);
@@ skipping 56 matching lines @@
   return PP_MakeUndefined();
 }
 
 int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting) {
   // Deprecated.
   NOTREACHED();
   return -1;
 }
 
 PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting) {
-  EnterInstance enter(instance);
+  EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);
   if (enter.failed())
     return PP_MakeUndefined();
-  return enter.functions()->GetFlashAPI()->GetSetting(instance, setting);
+  return enter.functions()->GetSetting(instance, setting);
 }
 
 PP_Bool SetCrashData(PP_Instance instance,
                      PP_FlashCrashKey key,
                      PP_Var value) {
   EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);
   if (enter.failed())
     return PP_FALSE;
   return enter.functions()->SetCrashData(instance, key, value);
 }
 
 int32_t EnumerateVideoCaptureDevices(PP_Instance instance,
                                      PP_Resource video_capture,
                                      PP_ArrayOutput devices) {
-  thunk::EnterResource<thunk::PPB_VideoCapture_API> enter(video_capture, true);
+  EnterResource<PPB_VideoCapture_API> enter(video_capture, true);
   if (enter.failed())
     return enter.retval();
   return enter.object()->EnumerateDevicesSync(devices);
 }
 
 const PPB_Flash_12_4 g_ppb_flash_12_4_thunk = {
   &SetInstanceAlwaysOnTop,
   &DrawGlyphs,
   &GetProxyForURL,
   &Navigate,
@@ skipping 77 matching lines @@
 const PPB_Flash_12_6* GetPPB_Flash_12_6_Thunk() {
   return &g_ppb_flash_12_6_thunk;
 }
 
 const PPB_Flash_13_0* GetPPB_Flash_13_0_Thunk() {
   return &g_ppb_flash_13_0_thunk;
 }
 
 }  // namespace thunk
 }  // namespace ppapi