Index: chrome/browser/webdata/web_intents_table.cc |
diff --git a/chrome/browser/webdata/web_intents_table.cc b/chrome/browser/webdata/web_intents_table.cc |
index ca067dfdc38ff5084f27a16f983bf9f497e641f4..675ce1f5bcad564a7443e3b1ad543ebd3f452b18 100644 |
--- a/chrome/browser/webdata/web_intents_table.cc |
+++ b/chrome/browser/webdata/web_intents_table.cc |
@@ -18,9 +18,10 @@ |
namespace { |
-int table_key = 0; |
- |
WebDatabaseTable::TypeKey GetKey() { |
+ // We just need a unique constant. Use the address of a static that |
+ // COMDAT folding won't touch in an optimizing linker. |
+ static int table_key = 0; |
return reinterpret_cast<void*>(&table_key); |
} |