Remove a few static initializers.

webkit/plugins/npapi/plugin_list.cc

Index: webkit/plugins/npapi/plugin_list.cc
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index ef2dd7ec1650d0c0ed1e552f79b7fcb55e348bf1..f12ce5c86bdbba359013ba79df1c584d76cb5c3e 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -75,19 +75,19 @@ static const VersionRangeDefinition kSilverlightVersionRange[] = {
 
 // Similarly, try and share the group definition for plug-ins that are
 // very consistent across OS'es.
-static const PluginGroupDefinition kFlashDefinition = {
-    "adobe-flash-player", "Flash", "Shockwave Flash", kFlashVersionRange,
-    arraysize(kFlashVersionRange), "http://get.adobe.com/flashplayer/" };
-
-static const PluginGroupDefinition kShockwaveDefinition = {
-    "shockwave", PluginGroup::kShockwaveGroupName, "Shockwave for Director",
-    kShockwaveVersionRange, arraysize(kShockwaveVersionRange),
-    "http://www.adobe.com/shockwave/download/" };
-
-static const PluginGroupDefinition kSilverlightDefinition = {
-    "silverlight", PluginGroup::kSilverlightGroupName, "Silverlight",
-    kSilverlightVersionRange, arraysize(kSilverlightVersionRange),
-    "http://www.microsoft.com/getsilverlight/" };
+#define kFlashDefinition { \

[Bernhard Bauer, 2011/11/29 00:29:21]

Does this mean that arrays are okay, but POD structs aren't?

[Nico, 2011/11/29 00:31:39]

It's still a POD struct, it's just that the array below that references this
isn't initialized through a const global but through an initializer list. Here's
a small repro case:

This produces a static initializer:

struct PluginGroupDefinition {
  const char* const identifier;
};
const PluginGroupDefinition kFlashDefinition = { "adobe-flash-player"};
static const PluginGroupDefinition kGroupDefinitions[] = {
  kFlashDefinition
};


This doesn't:

struct PluginGroupDefinition {
  const char* const identifier;
};
#define kFlashDefinition { "adobe-flash-player"}
static const PluginGroupDefinition kGroupDefinitions[] = {
  kFlashDefinition
};

(Only the kFlashDefinition definition line is different. That's with gcc 4.4.3;
clang gets it right either way.)

+    "adobe-flash-player", "Flash", "Shockwave Flash", kFlashVersionRange,\
+    arraysize(kFlashVersionRange), "http://get.adobe.com/flashplayer/" }
+
+#define kShockwaveDefinition { \
+    "shockwave", PluginGroup::kShockwaveGroupName, "Shockwave for Director", \
+    kShockwaveVersionRange, arraysize(kShockwaveVersionRange), \
+    "http://www.adobe.com/shockwave/download/" }
+
+#define kSilverlightDefinition { \
+    "silverlight", PluginGroup::kSilverlightGroupName, "Silverlight", \
+    kSilverlightVersionRange, arraysize(kSilverlightVersionRange), \
+    "http://www.microsoft.com/getsilverlight/" }
 
 #if defined(OS_MACOSX)
 // Plugin Groups for Mac.