Switch to standard integer types in content/.

content/child/npapi/plugin_instance.h

 // 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.
 
 // TODO: Need to deal with NPAPI's NPSavedData.
 //       I haven't seen plugins use it yet.
 
 #ifndef CONTENT_CHILD_NPAPI_PLUGIN_INSTANCE_H_
 #define CONTENT_CHILD_NPAPI_PLUGIN_INSTANCE_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <stack>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "build/build_config.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 #include "url/gurl.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
@@ skipping 105 matching lines @@
   void set_use_mozilla_user_agent() { use_mozilla_user_agent_ = true; }
 
   // If the plugin instance is backed by a texture, return its ID in the
   // compositor's namespace. Otherwise return 0. Returns 0 by default.
   unsigned GetBackingTextureId();
 
   // Helper that implements NPN_PluginThreadAsyncCall semantics
   void PluginThreadAsyncCall(void (*func)(void *),
                              void* userData);
 
-  uint32 ScheduleTimer(uint32 interval,
-                       NPBool repeat,
-                       void (*func)(NPP id, uint32 timer_id));
+  uint32_t ScheduleTimer(uint32_t interval,
+                         NPBool repeat,
+                         void (*func)(NPP id, uint32_t timer_id));
 
-  void UnscheduleTimer(uint32 timer_id);
+  void UnscheduleTimer(uint32_t timer_id);
 
   bool ConvertPoint(double source_x, double source_y,
                     NPCoordinateSpace source_space,
                     double* dest_x, double* dest_y,
                     NPCoordinateSpace dest_space);
 
   NPError PopUpContextMenu(NPMenu* menu);
 
   //
   // NPAPI methods for calling the Plugin Instance
@@ skipping 34 matching lines @@
   // owned or copied, so the caller must call this again with NULL before the
   // event pointer becomes invalid. Clients use ScopedCurrentPluginEvent rather
   // than calling this directly.
   void set_currently_handled_event(NPCocoaEvent* event) {
     currently_handled_event_ = event;
   }
 #endif
 
   ~PluginInstance();
   void OnPluginThreadAsyncCall(void (*func)(void *), void* userData);
-  void OnTimerCall(void (*func)(NPP id, uint32 timer_id),
-                   NPP id, uint32 timer_id);
+  void OnTimerCall(void (*func)(NPP id, uint32_t timer_id),
+                   NPP id,
+                   uint32_t timer_id);
 
   // This is a hack to get the real player plugin to work with chrome
   // The real player plugin dll(nppl3260) when loaded by firefox is loaded via
   // the NS COM API which is analogous to win32 COM. So the NPAPI functions in
   // the plugin are invoked via an interface by firefox. The plugin instance
   // handle which is passed to every NPAPI method is owned by the real player
   // plugin, i.e. it expects the ndata member to point to a structure which
   // it knows about. Eventually it dereferences this structure and compares
   // a member variable at offset 0x24(Version 6.0.11.2888) /2D (Version
   // 6.0.11.3088) with 0 and on failing this check, takes  a different code
   // path which causes a crash. Safari and Opera work with version 6.0.11.2888
   // by chance as their ndata structure contains a 0 at the location which real
   // player checks:(. They crash with version 6.0.11.3088 as well. The
   // following member just adds a 96 byte padding to our PluginInstance class
   // which is passed in the ndata member. This magic number works correctly on
   // Vista with UAC on or off :(.
   // NOTE: Please dont change the ordering of the member variables
   // New members should be added after this padding array.
   // TODO(iyengar) : Disassemble the Realplayer ndata structure and look into
   // the possiblity of conforming to it (http://b/issue?id=936667). We
   // could also log a bug with Real, which would save the effort.
-  uint8                                    zero_padding_[96];
+  uint8_t zero_padding_[96];
   scoped_refptr<PluginLib>                 plugin_;
   NPP                                      npp_;
   scoped_refptr<PluginHost>                host_;
   NPPluginFuncs*                           npp_functions_;
   gfx::PluginWindowHandle                  window_handle_;
   bool                                     windowless_;
   bool                                     transparent_;
   WebPlugin*                               webplugin_;
   std::string                              mime_type_;
   bool                                     use_mozilla_user_agent_;
@@ skipping 12 matching lines @@
 
   // Stack indicating if popups are to be enabled for the outgoing
   // NPN_GetURL/NPN_GetURLNotify calls.
   std::stack<bool>                         popups_enabled_stack_;
 
   // List of files created for the current plugin instance. File names are
   // added to the list every time the NPP_StreamAsFile function is called.
   std::vector<base::FilePath> files_created_;
 
   // Next unusued timer id.
-  uint32 next_timer_id_;
+  uint32_t next_timer_id_;
 
   // Map of timer id to settings for timer.
   struct TimerInfo {
-    uint32 interval;
+    uint32_t interval;
     bool repeat;
   };
-  typedef std::map<uint32, TimerInfo> TimerMap;
+  typedef std::map<uint32_t, TimerInfo> TimerMap;
   TimerMap timers_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 #if defined(OS_MACOSX)
 // Helper to simplify correct usage of set_currently_handled_event.
 // Instantiating will set |instance|'s currently handled to |event| for the
 // lifetime of the object, then NULL when it goes out of scope.
 class ScopedCurrentPluginEvent {
  public:
   ScopedCurrentPluginEvent(PluginInstance* instance, NPCocoaEvent* event);
   ~ScopedCurrentPluginEvent();
 
  private:
   scoped_refptr<PluginInstance> instance_;
   DISALLOW_COPY_AND_ASSIGN(ScopedCurrentPluginEvent);
 };
 #endif
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_NPAPI_PLUGIN_INSTANCE_H_