Index: chrome/browser/webdata/keyword_table.cc |
diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc |
index 10d224e8d7431a86be693729c262ac14451095bc..6327c0eac1e86f058c44bd3b3cccf0fc57e27197 100644 |
--- a/chrome/browser/webdata/keyword_table.cc |
+++ b/chrome/browser/webdata/keyword_table.cc |
@@ -116,9 +116,10 @@ void BindURLToStatement(const TemplateURLData& data, |
s->BindString(starting_column + 17, data.search_terms_replacement_key); |
} |
-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); |
} |