Replace strings with ints to avoid comdat folding on the thread watcher.

chrome/browser/metrics/thread_watcher_report_hang.cc

 // Copyright 2014 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 "chrome/browser/metrics/thread_watcher_report_hang.h"
 
 // We disable optimizations for the whole file so the compiler doesn't merge
 // them all together.
 MSVC_DISABLE_OPTIMIZE()
 MSVC_PUSH_DISABLE_WARNING(4748)
@@ skipping 13 matching lines @@
 #if defined(NDEBUG)
   base::debug::DumpWithoutCrashing();
 #else
   base::debug::BreakDebugger();
 #endif
 }
 
 #if !defined(OS_ANDROID) || !defined(NDEBUG)
 // TODO(rtenneti): Enabled crashing, after getting data.
 NOINLINE void StartupHang() {
-  volatile const char* inhibit_comdat = __FUNCTION__;
+  volatile int inhibit_comdat = __LINE__;
   ALLOW_UNUSED_LOCAL(inhibit_comdat);
   ReportThreadHang();
 }
 #endif  // OS_ANDROID
 
 NOINLINE void ShutdownHang() {
-  volatile const char* inhibit_comdat = __FUNCTION__;
+  volatile int inhibit_comdat = __LINE__;
   ALLOW_UNUSED_LOCAL(inhibit_comdat);
   ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_UI() {
-  volatile const char* inhibit_comdat = __FUNCTION__;
+  volatile int inhibit_comdat = __LINE__;
   ALLOW_UNUSED_LOCAL(inhibit_comdat);
   ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_DB() {
-  volatile const char* inhibit_comdat = __FUNCTION__;
+  volatile int inhibit_comdat = __LINE__;
   ALLOW_UNUSED_LOCAL(inhibit_comdat);
   ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_FILE() {
-  volatile const char* inhibit_comdat = __FUNCTION__;
+  volatile int inhibit_comdat = __LINE__;
   ALLOW_UNUSED_LOCAL(inhibit_comdat);
   ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_FILE_USER_BLOCKING() {
-  volatile const char* inhibit_comdat = __FUNCTION__;
+  volatile int inhibit_comdat = __LINE__;
   ALLOW_UNUSED_LOCAL(inhibit_comdat);
   ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_PROCESS_LAUNCHER() {
-  volatile const char* inhibit_comdat = __FUNCTION__;
+  volatile int inhibit_comdat = __LINE__;
   ALLOW_UNUSED_LOCAL(inhibit_comdat);
   ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_CACHE() {
-  volatile const char* inhibit_comdat = __FUNCTION__;
+  volatile int inhibit_comdat = __LINE__;
   ALLOW_UNUSED_LOCAL(inhibit_comdat);
   ReportThreadHang();
 }
 
 NOINLINE void ThreadUnresponsive_IO() {
-  volatile const char* inhibit_comdat = __FUNCTION__;
+  volatile int inhibit_comdat = __LINE__;
   ALLOW_UNUSED_LOCAL(inhibit_comdat);
   ReportThreadHang();
 }
 
 NOINLINE void CrashBecauseThreadWasUnresponsive(int thread_id) {
   // TODO(rtenneti): The following is a temporary change to check thread_id
   // numbers explicitly so that we will have minimum code. Will change after the
   // test run to use content::BrowserThread::ID enum.
   if (thread_id == 0)
     return ThreadUnresponsive_UI();
   else if (thread_id == 1)
     return ThreadUnresponsive_DB();
   else if (thread_id == 2)
     return ThreadUnresponsive_FILE();
   else if (thread_id == 3)
     return ThreadUnresponsive_FILE_USER_BLOCKING();
   else if (thread_id == 4)
     return ThreadUnresponsive_PROCESS_LAUNCHER();
   else if (thread_id == 5)
     return ThreadUnresponsive_CACHE();
   else if (thread_id == 6)
     return ThreadUnresponsive_IO();
 }
 
 }  // namespace metrics
 
 MSVC_POP_WARNING()
 MSVC_ENABLE_OPTIMIZE();