Support 32-bit subversion fields in base::Version.

content/child/npapi/webplugin_delegate_impl_win.cc

Index: content/child/npapi/webplugin_delegate_impl_win.cc
diff --git a/content/child/npapi/webplugin_delegate_impl_win.cc b/content/child/npapi/webplugin_delegate_impl_win.cc
index fffbe2e74f704e432af2fc0b34060ae93afb8043..53909b13a08f372142fb941d63eac4c76ffb6044 100644
--- a/content/child/npapi/webplugin_delegate_impl_win.cc
+++ b/content/child/npapi/webplugin_delegate_impl_win.cc
@@ -187,11 +187,11 @@ std::wstring GetKeyPath(HKEY key) {
   return std::wstring(info->Name, info->NameLength / sizeof(wchar_t));
 }
 
-int GetPluginMajorVersion(const WebPluginInfo& plugin_info) {
+unsigned int GetPluginMajorVersion(const WebPluginInfo& plugin_info) {

[Nico, 2015/03/09 14:21:57]

uint32_t?

[Will Harris, 2015/03/09 22:52:18]

Done.

   Version plugin_version;
   WebPluginInfo::CreateVersionFromString(plugin_info.version, &plugin_version);
 
-  int major_version = 0;
+  unsigned int major_version = 0;
   if (plugin_version.IsValid())
     major_version = plugin_version.components()[0];
 
@@ -266,7 +266,7 @@ WebPluginDelegateImpl::WebPluginDelegateImpl(
     quirks_ |= PLUGIN_QUIRK_FAKE_WINDOW_FROM_POINT;
   } else if (filename == kAcrobatReaderPlugin) {
     // Check for the version number above or equal 9.
-    int major_version = GetPluginMajorVersion(plugin_info);
+    unsigned int major_version = GetPluginMajorVersion(plugin_info);
     if (major_version >= 9) {
       quirks_ |= PLUGIN_QUIRK_DIE_AFTER_UNLOAD;
       // 9.2 needs this.
@@ -300,7 +300,7 @@ WebPluginDelegateImpl::WebPluginDelegateImpl(
     // VLC hangs on NPP_Destroy if we call NPP_SetWindow with a null window
     // handle
     quirks_ |= PLUGIN_QUIRK_DONT_SET_NULL_WINDOW_HANDLE_ON_DESTROY;
-    int major_version = GetPluginMajorVersion(plugin_info);
+    unsigned int major_version = GetPluginMajorVersion(plugin_info);
     if (major_version == 0) {
       // VLC 0.8.6d and 0.8.6e crash if multiple instances are created.
       quirks_ |= PLUGIN_QUIRK_DONT_ALLOW_MULTIPLE_INSTANCES;