Revert 217164 "[Telemetry] Report network metrics for the page c..."

It broke several perf bots. e.g.
http://build.chromium.org/p/chromium.perf/builders/Linux%20Perf%20%284%29/builds/7027

> [Telemetry] Report network metrics for the page cycler.
> 
> Output statistics about num bytes sent/received, num requests, num connections,
> etc. This will be useful for finding the pages the most inefficiently utilize
> the network over the top million sites. It will also be useful for helping
> diagnose non-determinism in measurements/web page replay.
> 
> BUG=None
> 
> Review URL: https://chromiumcodereview.appspot.com/22539003

TBR=semenzato@chromium.org

Review URL: https://codereview.chromium.org/22809003

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

2 files changed, 0 insertions, 64 deletions

diff --git a/tools/perf/measurements/page_cycler.py b/tools/perf/measurements/page_cycler.py
index c6b5020..50d11e8 100644
--- a/tools/perf/measurements/page_cycler.py
+++ b/tools/perf/measurements/page_cycler.py
@@ -21,7 +21,6 @@ import sys
 from metrics import histogram
 from metrics import io
 from metrics import memory
-from metrics import network
 from telemetry.core import util
 from telemetry.page import page_measurement
 
@@ -42,7 +41,6 @@ class PageCycler(page_measurement.PageMeasurement):
 
     self._memory_metric = None
     self._histograms = None
-    self._network_metric = network.NetworkMetric()
 
   def AddCommandLineOptions(self, parser):
     # The page cyclers should default to 10 iterations. In order to change the
@@ -68,7 +66,6 @@ class PageCycler(page_measurement.PageMeasurement):
 
   def WillNavigateToPage(self, page, tab):
     page.script_to_evaluate_on_commit = self._page_cycler_js
-    self._network_metric.Start(page, tab)
 
   def DidNavigateToPage(self, page, tab):
     for h in self._histograms:
@@ -82,11 +79,6 @@ class PageCycler(page_measurement.PageMeasurement):
     # Old commandline flags used for reference builds.
     options.AppendExtraBrowserArg('--dom-automation')
 
-    # TODO(tonyg): NetworkMetric should be responsible for setting these.
-    # http://crbug.com/271177
-    options.AppendExtraBrowserArg('--enable-benchmarking')
-    options.AppendExtraBrowserArg('--enable-stats-table')
-
     # Temporarily disable typical_25 page set on mac.
     if sys.platform == 'darwin' and sys.argv[-1].endswith('/typical_25.json'):
       print 'typical_25 is currently disabled on mac. Skipping test.'
@@ -101,9 +93,6 @@ class PageCycler(page_measurement.PageMeasurement):
     for h in self._histograms:
       h.GetValue(page, tab, results)
 
-    self._network_metric.Stop(page, tab)
-    self._network_metric.AddResults(tab, results)
-
     results.Add('page_load_time', 'ms',
                 int(float(tab.EvaluateJavaScript('__pc_load_time'))),
                 chart_name='times')
diff --git a/tools/perf/metrics/network.py b/tools/perf/metrics/network.py
deleted file mode 100644
index 662159e..0000000
--- a/tools/perf/metrics/network.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2013 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.
-
-import json
-
-from metrics import Metric
-
-_COUNTER_TO_RESULTS = {
-    'tcp.read_bytes':               ('tcp_read_bytes',    'bytes'),
-    'tcp.write_bytes':              ('tcp_write_bytes',   'bytes'),
-    'HttpNetworkTransaction.Count': ('num_requests',      'count'),
-    'tcp.connect':                  ('num_connects',      'count'),
-    'spdy.sessions':                ('num_spdy_sessions', 'count'),
-    }
-
-class NetworkMetric(Metric):
-  """A metric for network information."""
-
-  def __init__(self):
-    super(NetworkMetric, self).__init__()
-    self._results = None
-
-  def _GetCounters(self, tab):
-    return tab.EvaluateJavaScript("""
-(function(counters) {
-  var results = {};
-  if (!window.chrome || !window.chrome.benchmarking)
-    return results;
-  for (var i = 0; i < counters.length; i++)
-    results[counters[i]] = chrome.benchmarking.counter(counters[i]);
-  return results;
-})(%s);
-""" % json.dumps(_COUNTER_TO_RESULTS.keys()))
-
-  def Start(self, page, tab):
-    assert not self._results, 'Must AddResults() before calling Start() again.'
-    self._results = self._GetCounters(tab)
-
-  def Stop(self, page, tab):
-    assert self._results, 'Must Start() before Stop().'
-    results = self._GetCounters(tab)
-    for counter in self._results:
-      self._results[counter] = results[counter] - self._results[counter]
-
-  def AddResults(self, tab, results):
-    assert self._results, 'Must Start() and Stop() before AddResults().'
-    for counter, trace_unit in _COUNTER_TO_RESULTS.iteritems():
-      if counter not in self._results:
-        continue
-      results.Add(trace_unit[0], trace_unit[1], self._results[counter],
-                  data_type='unimportant')
-    self._results = None