Index: chrome/browser/webdata/token_service_table.cc |
diff --git a/chrome/browser/webdata/token_service_table.cc b/chrome/browser/webdata/token_service_table.cc |
index 1270cbe413928f9caed64aaf3078debffd6bed11..deb689519b966a536705beb11bffaa3fca1bc929 100644 |
--- a/chrome/browser/webdata/token_service_table.cc |
+++ b/chrome/browser/webdata/token_service_table.cc |
@@ -14,9 +14,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); |
} |