Switch to narrowest scope for a static, per suggestion in a review on another file.

components/webdata/autofill/autofill_table.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/webdata/autofill/autofill_table.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 304 matching lines @@
   if (!s2.Run())
     return false;
 
   sql::Statement s3(db->GetUniqueStatement(
       "DELETE FROM autofill_profile_phones WHERE guid = ?"));
   s3.BindString(0, guid);
 
   return s3.Run();
 }
 
-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);
 }
 
 }  // namespace
 
 // The maximum length allowed for form data.
 const size_t AutofillTable::kMaxDataLength = 1024;
 
 AutofillTable::AutofillTable(const std::string& app_locale)
     : app_locale_(app_locale) {
@@ skipping 1702 matching lines @@
         "WHERE guid=?"));
     s_date.BindInt64(0, date_item->second);
     s_date.BindString(1, iter->guid());
 
     if (!s_date.Run())
       return false;
   }
 
   return true;
 }