Fixed browser crash when Telemetry uses Debug build.

Factored out chrome.benchmarking methods which don't depend on stats table.


BUG=168640

TEST=tools/telemetry/run_tests --browser=debug PageRunnerTests

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=182754

Review URL: https://chromiumcodereview.appspot.com/11801024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183611 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 74 deletions

diff --git a/chrome/renderer/benchmarking_extension.cc b/chrome/renderer/benchmarking_extension.cc
index 1125550..7572a40 100644
--- a/chrome/renderer/benchmarking_extension.cc
+++ b/chrome/renderer/benchmarking_extension.cc
@@ -7,14 +7,10 @@
 #include "base/command_line.h"
 #include "base/metrics/stats_table.h"
 #include "base/time.h"
-#include "chrome/common/benchmarking_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_thread.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
 #include "v8/include/v8.h"
 
-using WebKit::WebCache;
-
 const char kBenchmarkingExtensionName[] = "v8/Benchmarking";
 
 namespace extensions_v8 {
@@ -29,30 +25,10 @@ class BenchmarkingWrapper : public v8::Extension {
         "if (typeof(chrome.benchmarking) == 'undefined') {"
         "  chrome.benchmarking = {};"
         "};"
-        "chrome.benchmarking.clearCache = function() {"
-        "  native function ClearCache();"
-        "  ClearCache();"
-        "};"
-        "chrome.benchmarking.clearHostResolverCache = function() {"
-        "  native function ClearHostResolverCache();"
-        "  ClearHostResolverCache();"
-        "};"
-        "chrome.benchmarking.clearPredictorCache = function() {"
-        "  native function ClearPredictorCache();"
-        "  ClearPredictorCache();"
-        "};"
-        "chrome.benchmarking.closeConnections = function() {"
-        "  native function CloseConnections();"
-        "  CloseConnections();"
-        "};"
         "chrome.benchmarking.counter = function(name) {"
         "  native function GetCounter();"
         "  return GetCounter(name);"
         "};"
-        "chrome.benchmarking.enableSpdy = function(name) {"
-        "  native function EnableSpdy();"
-        "  EnableSpdy(name);"
-        "};"
         "chrome.benchmarking.isSingleProcess = function() {"
         "  native function IsSingleProcess();"
         "  return IsSingleProcess();"
@@ -80,18 +56,8 @@ class BenchmarkingWrapper : public v8::Extension {
         ) {}
 
   virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
-      v8::Handle<v8::String> name) OVERRIDE {
-    if (name->Equals(v8::String::New("CloseConnections"))) {
-      return v8::FunctionTemplate::New(CloseConnections);
-    } else if (name->Equals(v8::String::New("ClearCache"))) {
-      return v8::FunctionTemplate::New(ClearCache);
-    } else if (name->Equals(v8::String::New("ClearHostResolverCache"))) {
-      return v8::FunctionTemplate::New(ClearHostResolverCache);
-    } else if (name->Equals(v8::String::New("ClearPredictorCache"))) {
-      return v8::FunctionTemplate::New(ClearPredictorCache);
-    } else if (name->Equals(v8::String::New("EnableSpdy"))) {
-      return v8::FunctionTemplate::New(EnableSpdy);
-    } else if (name->Equals(v8::String::New("GetCounter"))) {
+      v8::Handle<v8::String> name) {
+    if (name->Equals(v8::String::New("GetCounter"))) {
       return v8::FunctionTemplate::New(GetCounter);
     } else if (name->Equals(v8::String::New("IsSingleProcess"))) {
       return v8::FunctionTemplate::New(IsSingleProcess);
@@ -102,44 +68,6 @@ class BenchmarkingWrapper : public v8::Extension {
     return v8::Handle<v8::FunctionTemplate>();
   }
 
-  static v8::Handle<v8::Value> CloseConnections(const v8::Arguments& args) {
-    content::RenderThread::Get()->Send(
-        new ChromeViewHostMsg_CloseCurrentConnections());
-    return v8::Undefined();
-  }
-
-  static v8::Handle<v8::Value> ClearCache(const v8::Arguments& args) {
-    int rv;
-    content::RenderThread::Get()->Send(new ChromeViewHostMsg_ClearCache(&rv));
-    WebCache::clear();
-    return v8::Undefined();
-  }
-
-  static v8::Handle<v8::Value> ClearHostResolverCache(
-      const v8::Arguments& args) {
-    int rv;
-    content::RenderThread::Get()->Send(
-        new ChromeViewHostMsg_ClearHostResolverCache(&rv));
-    return v8::Undefined();
-  }
-
-  static v8::Handle<v8::Value> ClearPredictorCache(
-      const v8::Arguments& args) {
-    int rv;
-    content::RenderThread::Get()->Send(
-        new ChromeViewHostMsg_ClearPredictorCache(&rv));
-    return v8::Undefined();
-  }
-
-  static v8::Handle<v8::Value> EnableSpdy(const v8::Arguments& args) {
-    if (!args.Length() || !args[0]->IsBoolean())
-      return v8::Undefined();
-
-    content::RenderThread::Get()->Send(new ChromeViewHostMsg_EnableSpdy(
-        args[0]->BooleanValue()));
-    return v8::Undefined();
-  }
-
   static v8::Handle<v8::Value> GetCounter(const v8::Arguments& args) {
     if (!args.Length() || !args[0]->IsString() || !base::StatsTable::current())
       return v8::Undefined();