Revert 106142 - Add a new globals object for PPAPI tracking information.

webkit/plugins/ppapi/ppb_flash_clipboard_impl.cc

Index: webkit/plugins/ppapi/ppb_flash_clipboard_impl.cc
===================================================================
--- webkit/plugins/ppapi/ppb_flash_clipboard_impl.cc	(revision 106147)
+++ webkit/plugins/ppapi/ppb_flash_clipboard_impl.cc	(working copy)
@@ -18,7 +18,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitPlatformSupport.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "webkit/plugins/ppapi/common.h"
-#include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
@@ -65,8 +64,7 @@
                           PP_Flash_Clipboard_Type clipboard_type,
                           PP_Flash_Clipboard_Format format) {
   // If you don't give us an instance, we don't give you anything.
-  PluginInstance* instance =
-      HostGlobals::Get()->host_resource_tracker()->GetInstance(instance_id);
+  PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
   if (!instance)
     return PP_FALSE;
 
@@ -84,8 +82,7 @@
 
 PP_Var ReadPlainText(PP_Instance instance_id,
                      PP_Flash_Clipboard_Type clipboard_type) {
-  PluginInstance* instance =
-      HostGlobals::Get()->host_resource_tracker()->GetInstance(instance_id);
+  PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
   if (!instance)
     return PP_MakeNull();
 
Property changes on: webkit/plugins/ppapi/ppb_flash_clipboard_impl.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_flash_clipboard_impl.cc:r3734-4217,4606-5108,5177-5263