Removing ANDROID_INSTRUMENTATION code

This has not been used for years, and due to WebKit merges the
results are not accurate anymore.

The resulting code is cleaner, less likely to create merge conflicts,
and does not give the impression that this can be turned on and
it will still work.

Needs CL:
https://android-git.corp.google.com/g/#/c/148912/

Change-Id: I617ad00c103ab72038371a3203452d2ccec0e50c

2 files changed, 0 insertions, 22 deletions

diff --git a/Source/JavaScriptCore/parser/Parser.cpp b/Source/JavaScriptCore/parser/Parser.cpp
index dc15e4f..fc1e986 100644
--- a/Source/JavaScriptCore/parser/Parser.cpp
+++ b/Source/JavaScriptCore/parser/Parser.cpp
@@ -27,17 +27,10 @@
 #include "JSParser.h"
 #include "Lexer.h"
 
-#ifdef ANDROID_INSTRUMENT
-#include "TimeCounter.h"
-#endif
-
 namespace JSC {
 
 void Parser::parse(JSGlobalData* globalData, FunctionParameters* parameters, JSParserStrictness strictness, JSParserMode mode, int* errLine, UString* errMsg)
 {
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::JavaScriptParseTimeCounter);
-#endif
     ASSERT(globalData);
     m_sourceElements = 0;
 
@@ -65,9 +58,6 @@ void Parser::parse(JSGlobalData* globalData, FunctionParameters* parameters, JSP
         *errMsg = parseError ? parseError : "Parse error";
         m_sourceElements = 0;
     }
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::JavaScriptParseTimeCounter, __FUNCTION__);
-#endif
 }
 
 void Parser::didFinishParsing(SourceElements* sourceElements, ParserArenaData<DeclarationStacks::VarStack>* varStack, 
diff --git a/Source/JavaScriptCore/runtime/TimeoutChecker.h b/Source/JavaScriptCore/runtime/TimeoutChecker.h
index 71ce169..5925641 100644
--- a/Source/JavaScriptCore/runtime/TimeoutChecker.h
+++ b/Source/JavaScriptCore/runtime/TimeoutChecker.h
@@ -31,10 +31,6 @@
 
 #include <wtf/Assertions.h>
 
-#ifdef ANDROID_INSTRUMENT
-#include "TimeCounter.h"
-#endif
-
 namespace JSC {
 
     class ExecState;
@@ -52,10 +48,6 @@ namespace JSC {
         {
             if (!m_startCount)
                 reset();
-#ifdef ANDROID_INSTRUMENT
-            if (!m_startCount)
-                android::TimeCounter::start(android::TimeCounter::JavaScriptTimeCounter);
-#endif
             ++m_startCount;
         }
 
@@ -63,10 +55,6 @@ namespace JSC {
         {
             ASSERT(m_startCount);
             --m_startCount;
-#ifdef ANDROID_INSTRUMENT
-            if (!m_startCount)
-                android::TimeCounter::record(android::TimeCounter::JavaScriptTimeCounter, __FUNCTION__);
-#endif
         }
 
         void reset();