Re-land 714393002 after fixing android build.

sky/engine/wtf/InstanceCounter.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 25 matching lines @@
 namespace WTF {
 
 #if ENABLE(INSTANCE_COUNTER) || ENABLE(GC_PROFILING)
 
 #if COMPILER(CLANG)
 const size_t extractNameFunctionPrefixLength = sizeof("const char *WTF::extractNameFunction() [T = ") - 1;
 const size_t extractNameFunctionPostfixLength = sizeof("]") - 1;
 #elif COMPILER(GCC)
 const size_t extractNameFunctionPrefixLength = sizeof("const char* WTF::extractNameFunction() [with T = ") - 1;
 const size_t extractNameFunctionPostfixLength = sizeof("]") - 1;
-#elif COMPILER(MSVC)
-const size_t extractNameFunctionPrefixLength = sizeof("const char *__cdecl WTF::extractNameFunction<class ") - 1;
-const size_t extractNameFunctionPostfixLength = sizeof(">(void)") - 1;
 #else
 #warning "Extracting typename is supported only in compiler GCC, CLANG and MSVC at this moment"
 #endif
 
 // This function is used to stringify a typename T without using RTTI.
 // The result of extractNameFunction<T>() is given as |funcName|. |extractTypeNameFromFunctionName| then extracts a typename string from |funcName|.
 String extractTypeNameFromFunctionName(const char* funcName)
 {
-#if COMPILER(CLANG) || COMPILER(GCC) || COMPILER(MSVC)
+#if COMPILER(CLANG) || COMPILER(GCC)
     size_t funcNameLength = strlen(funcName);
     ASSERT(funcNameLength > extractNameFunctionPrefixLength + extractNameFunctionPostfixLength);
 
     const char* funcNameWithoutPrefix = funcName + extractNameFunctionPrefixLength;
     return String(funcNameWithoutPrefix, funcNameLength - extractNameFunctionPrefixLength - extractNameFunctionPostfixLength);
 #else
     return String("unknown");
 #endif
 }
 
@@ skipping 77 matching lines @@
 #else
 
 String dumpRefCountedInstanceCounts()
 {
     return String("{}");
 }
 
 #endif // ENABLE(INSTANCE_COUNTER) || ENABLE(GC_PROFILING)
 
 } // namespace WTF