Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_flash_impl.cc

 // Copyright (c) 2011 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 "webkit/plugins/ppapi/ppb_flash_impl.h"
 
 #include <string>
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/shared_impl/time_conversion.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_url_request_info_impl.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
 
 using ppapi::PPTimeToTime;
 using ppapi::StringVar;
 using ppapi::thunk::EnterResource;
 using ppapi::thunk::PPB_URLRequestInfo_API;
 
 namespace webkit {
 namespace ppapi {
 
@@ skipping 26 matching lines @@
                  bool from_user_action) {
   EnterResource<PPB_URLRequestInfo_API> enter(request_id, true);
   if (enter.failed())
     return PP_ERROR_BADRESOURCE;
   PPB_URLRequestInfo_Impl* request =
       static_cast<PPB_URLRequestInfo_Impl*>(enter.object());
 
   if (!target)
     return PP_ERROR_BADARGUMENT;
 
-  PluginInstance* instance = request->instance();
-  if (!instance)
+  PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(request);
+  if (!plugin_instance)
     return PP_ERROR_FAILED;
-
-  return instance->Navigate(request, target, from_user_action);
+  return plugin_instance->Navigate(request, target, from_user_action);
 }
 
 void RunMessageLoop(PP_Instance instance) {
   bool old_state = MessageLoop::current()->NestableTasksAllowed();
   MessageLoop::current()->SetNestableTasksAllowed(true);
   MessageLoop::current()->Run();
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 }
 
 void QuitMessageLoop(PP_Instance instance) {
@@ skipping 44 matching lines @@
 
 }  // namespace
 
 // static
 const PPB_Flash* PPB_Flash_Impl::GetInterface() {
   return &ppb_flash;
 }
 
 }  // namespace ppapi
 }  // namespace webkit