Update Chrome to use the new int64-typedefed module, instance, and resources ...

webkit/glue/plugins/pepper_plugin_module.cc

 // Copyright (c) 2010 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/glue/plugins/pepper_plugin_module.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 104 matching lines @@
   // FIXME(brettw) do uniquifying of the plugin here like the NPAPI one.
 
   scoped_refptr<PluginModule> lib(new PluginModule(filename));
   if (!lib->Load())
     lib = NULL;
   return lib;
 }
 
 // static
 PluginModule* PluginModule::FromPPModule(PP_Module module) {
-  PluginModule* lib = reinterpret_cast<PluginModule*>(module.id);
+  PluginModule* lib = reinterpret_cast<PluginModule*>(module);
   if (GetLivePluginSet()->find(lib) == GetLivePluginSet()->end())
     return NULL;  // Invalid plugin.
   return lib;
 }
 
 bool PluginModule::Load() {
   if (initialized_)
     return true;
   initialized_ = true;
 
@@ skipping 23 matching lines @@
   int retval = initialize_module(GetPPModule(), &GetInterface);
   if (retval != 0) {
     LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
     return false;
   }
 
   return true;
 }
 
 PP_Module PluginModule::GetPPModule() const {
-  PP_Module ret;
-  ret.id = reinterpret_cast<intptr_t>(this);
-  return ret;
+  return reinterpret_cast<intptr_t>(this);
 }
 
 PluginInstance* PluginModule::CreateInstance(PluginDelegate* delegate) {
   const PPP_Instance* plugin_instance_interface =
       reinterpret_cast<const PPP_Instance*>(GetPluginInterface(
           PPP_INSTANCE_INTERFACE));
   if (!plugin_instance_interface) {
     LOG(WARNING) << "Plugin doesn't support instance interface, failing.";
     return NULL;
   }
@@ skipping 15 matching lines @@
 
 void PluginModule::InstanceCreated(PluginInstance* instance) {
   instances_.insert(instance);
 }
 
 void PluginModule::InstanceDeleted(PluginInstance* instance) {
   instances_.erase(instance);
 }
 
 }  // namespace pepper