Add a new globals object for PPAPI tracking information.

webkit/plugins/ppapi/ppb_flash_file_impl.cc

Index: webkit/plugins/ppapi/ppb_flash_file_impl.cc
===================================================================
--- webkit/plugins/ppapi/ppb_flash_file_impl.cc	(revision 106515)
+++ webkit/plugins/ppapi/ppb_flash_file_impl.cc	(working copy)
@@ -16,6 +16,7 @@
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/file_path.h"
 #include "webkit/plugins/ppapi/file_type_conversions.h"
+#include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
@@ -66,7 +67,8 @@
   if (!path || !PepperFileOpenFlagsToPlatformFileFlags(mode, &flags) || !file)
     return PP_ERROR_BADARGUMENT;
 
-  PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
+  PluginInstance* instance =
+      HostGlobals::Get()->host_resource_tracker()->GetInstance(pp_instance);
   if (!instance)
     return PP_ERROR_FAILED;
 
@@ -85,7 +87,8 @@
   if (!from_path || !to_path)
     return PP_ERROR_BADARGUMENT;
 
-  PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
+  PluginInstance* instance =
+      HostGlobals::Get()->host_resource_tracker()->GetInstance(pp_instance);
   if (!instance)
     return PP_ERROR_FAILED;
 
@@ -101,7 +104,8 @@
   if (!path)
     return PP_ERROR_BADARGUMENT;
 
-  PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
+  PluginInstance* instance =
+      HostGlobals::Get()->host_resource_tracker()->GetInstance(pp_instance);
   if (!instance)
     return PP_ERROR_FAILED;
 
@@ -115,7 +119,8 @@
   if (!path)
     return PP_ERROR_BADARGUMENT;
 
-  PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
+  PluginInstance* instance =
+      HostGlobals::Get()->host_resource_tracker()->GetInstance(pp_instance);
   if (!instance)
     return PP_ERROR_FAILED;
 
@@ -130,7 +135,8 @@
   if (!path || !info)
     return PP_ERROR_BADARGUMENT;
 
-  PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
+  PluginInstance* instance =
+      HostGlobals::Get()->host_resource_tracker()->GetInstance(pp_instance);
   if (!instance)
     return PP_ERROR_FAILED;
 
@@ -157,7 +163,8 @@
                                   PP_DirContents_Dev** contents) {
   if (!path || !contents)
     return PP_ERROR_BADARGUMENT;
-  PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
+  PluginInstance* instance =
+      HostGlobals::Get()->host_resource_tracker()->GetInstance(pp_instance);
   if (!instance)
     return PP_ERROR_FAILED;
 
Property changes on: webkit/plugins/ppapi/ppb_flash_file_impl.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_flash_file_impl.cc:r3734-4217,4606-5108,5177-5263