diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 00:52:39 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 00:52:39 +0000 |
| commit | 5557b198f9815a758cf5a27d463e077b8bbbbfd8 (patch) | |
| tree | 72d192231b743092b69ba1cbb5bb4501aa324e41 /net/http | |
| parent | dc86fccde35745d2b1501fcc08d9aa42ea1ee1cc (diff) | |
| download | chromium_src-5557b198f9815a758cf5a27d463e077b8bbbbfd8.zip chromium_src-5557b198f9815a758cf5a27d463e077b8bbbbfd8.tar.gz chromium_src-5557b198f9815a758cf5a27d463e077b8bbbbfd8.tar.bz2 | |
Revert 84197 - Add one-time randomization support for FieldTrial, and the ability to
disable field trials. I am going to have a need for both soon.
Cleaning up some comments about empty trial names, adding static
method TrialExists() and simplifying many call sites by using this
method.
While I'm in there and needing base/OWNERS approval, add an OWNERS
file for base/metrics that adds jar@chromium.org as an owner for that
directory.
BUG=none
TEST=base_unittests
TBR=jam@chromium.org
R=jar@chromium.org,phajdan.jr@chromium.org,mark@chromium.org,wtc@chromium.org
Reason for revert: See http://crbug.com/81750
BUG=81750
TBR=joi@chromium.org
Review URL: http://codereview.chromium.org/6931048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_cache_transaction.cc | 3 | ||||
| -rw-r--r-- | net/http/http_network_transaction.cc | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index c8b2b33..ec7561b 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -870,7 +870,8 @@ int HttpCache::Transaction::DoAddToEntryComplete(int result) { base::TimeTicks::Now() - entry_lock_waiting_since_; UMA_HISTOGRAM_TIMES("HttpCache.EntryLockWait", entry_lock_wait); static const bool prefetching_fieldtrial = - base::FieldTrialList::TrialExists("Prefetch"); + base::FieldTrialList::Find("Prefetch") && + !base::FieldTrialList::Find("Prefetch")->group_name().empty(); if (prefetching_fieldtrial) { UMA_HISTOGRAM_TIMES( base::FieldTrial::MakeName("HttpCache.EntryLockWait", "Prefetch"), diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index f298679..5cd2f92 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -1010,8 +1010,9 @@ void HttpNetworkTransaction::LogTransactionConnectedMetrics() { base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(10), 100); - static const bool use_conn_impact_histogram = - base::FieldTrialList::TrialExists("ConnCountImpact"); + static bool use_conn_impact_histogram( + base::FieldTrialList::Find("ConnCountImpact") && + !base::FieldTrialList::Find("ConnCountImpact")->group_name().empty()); if (use_conn_impact_histogram) { UMA_HISTOGRAM_CLIPPED_TIMES( base::FieldTrial::MakeName("Net.Transaction_Connected_New", @@ -1022,8 +1023,8 @@ void HttpNetworkTransaction::LogTransactionConnectedMetrics() { } } - static const bool use_spdy_histogram = - base::FieldTrialList::TrialExists("SpdyImpact"); + static bool use_spdy_histogram(base::FieldTrialList::Find("SpdyImpact") && + !base::FieldTrialList::Find("SpdyImpact")->group_name().empty()); if (use_spdy_histogram && response_.was_npn_negotiated) { UMA_HISTOGRAM_CLIPPED_TIMES( base::FieldTrial::MakeName("Net.Transaction_Connected_Under_10", |