summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 04:38:38 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 04:38:38 +0000
commit835d7c811c98f179090c57a827a9c9baa2130435 (patch)
treeedcff6b2c9029c6f867f650d762837f2485d99fb /net/http
parent4b1deac7ba7e7a6bf0425e6ed4db26e0c29daa7f (diff)
downloadchromium_src-835d7c811c98f179090c57a827a9c9baa2130435.zip
chromium_src-835d7c811c98f179090c57a827a9c9baa2130435.tar.gz
chromium_src-835d7c811c98f179090c57a827a9c9baa2130435.tar.bz2
Move Stats, histograms, and field trial into a metrics subdirectory of base and
put them in the base namespace. TEST=it compiles BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_auth_controller.cc2
-rw-r--r--net/http/http_auth_handler.cc6
-rw-r--r--net/http/http_auth_handler.h4
-rw-r--r--net/http/http_cache_transaction.cc10
-rw-r--r--net/http/http_network_layer.cc1
-rw-r--r--net/http/http_network_transaction.cc22
-rw-r--r--net/http/http_stream_parser.cc2
7 files changed, 25 insertions, 22 deletions
diff --git a/net/http/http_auth_controller.cc b/net/http/http_auth_controller.cc
index 736ffa9..545ae2a 100644
--- a/net/http/http_auth_controller.cc
+++ b/net/http/http_auth_controller.cc
@@ -4,7 +4,7 @@
#include "net/http/http_auth_controller.h"
-#include "base/histogram.h"
+#include "base/metrics/histogram.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "net/base/auth.h"
diff --git a/net/http/http_auth_handler.cc b/net/http/http_auth_handler.cc
index ccb8766..d6e6a62 100644
--- a/net/http/http_auth_handler.cc
+++ b/net/http/http_auth_handler.cc
@@ -4,8 +4,8 @@
#include "net/http/http_auth_handler.h"
-#include "base/histogram.h"
#include "base/logging.h"
+#include "base/metrics/histogram.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "net/base/net_errors.h"
@@ -52,11 +52,11 @@ bool HttpAuthHandler::InitFromChallenge(
DCHECK(!ok || properties_ != -1);
if (ok)
- histogram_ = Histogram::FactoryTimeGet(
+ histogram_ = base::Histogram::FactoryTimeGet(
GenerateHistogramNameFromScheme(scheme()),
base::TimeDelta::FromMilliseconds(1),
base::TimeDelta::FromSeconds(10), 50,
- Histogram::kUmaTargetedHistogramFlag);
+ base::Histogram::kUmaTargetedHistogramFlag);
return ok;
}
diff --git a/net/http/http_auth_handler.h b/net/http/http_auth_handler.h
index 4c03a01..908b065 100644
--- a/net/http/http_auth_handler.h
+++ b/net/http/http_auth_handler.h
@@ -14,7 +14,9 @@
#include "net/base/net_log.h"
#include "net/http/http_auth.h"
+namespace base {
class Histogram;
+}
namespace net {
@@ -187,7 +189,7 @@ class HttpAuthHandler {
CompletionCallbackImpl<HttpAuthHandler> wrapper_callback_;
// When GenerateAuthToken was called.
base::TimeTicks generate_auth_token_start_;
- scoped_refptr<Histogram> histogram_;
+ scoped_refptr<base::Histogram> histogram_;
};
} // namespace net
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index 138cd13..5d05616 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -13,8 +13,8 @@
#include <string>
#include "base/compiler_specific.h"
-#include "base/field_trial.h"
-#include "base/histogram.h"
+#include "base/metrics/field_trial.h"
+#include "base/metrics/histogram.h"
#include "base/ref_counted.h"
#include "base/string_util.h"
#include "base/time.h"
@@ -856,11 +856,11 @@ 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 =
- FieldTrialList::Find("Prefetch") &&
- !FieldTrialList::Find("Prefetch")->group_name().empty();
+ base::FieldTrialList::Find("Prefetch") &&
+ !base::FieldTrialList::Find("Prefetch")->group_name().empty();
if (prefetching_fieldtrial) {
UMA_HISTOGRAM_TIMES(
- FieldTrial::MakeName("HttpCache.EntryLockWait", "Prefetch"),
+ base::FieldTrial::MakeName("HttpCache.EntryLockWait", "Prefetch"),
entry_lock_wait);
}
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index cf93500..38f95ef 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -4,7 +4,6 @@
#include "net/http/http_network_layer.h"
-#include "base/field_trial.h"
#include "base/logging.h"
#include "base/string_split.h"
#include "base/string_util.h"
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 8ef9aca..bf1c0e9 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -8,11 +8,11 @@
#include <vector>
#include "base/compiler_specific.h"
-#include "base/field_trial.h"
#include "base/format_macros.h"
-#include "base/histogram.h"
+#include "base/metrics/field_trial.h"
+#include "base/metrics/histogram.h"
+#include "base/metrics/stats_counters.h"
#include "base/scoped_ptr.h"
-#include "base/stats_counters.h"
#include "base/stl_util-inl.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
@@ -976,11 +976,11 @@ void HttpNetworkTransaction::LogTransactionConnectedMetrics() {
100);
static bool use_conn_impact_histogram(
- FieldTrialList::Find("ConnCountImpact") &&
- !FieldTrialList::Find("ConnCountImpact")->group_name().empty());
+ base::FieldTrialList::Find("ConnCountImpact") &&
+ !base::FieldTrialList::Find("ConnCountImpact")->group_name().empty());
if (use_conn_impact_histogram) {
UMA_HISTOGRAM_CLIPPED_TIMES(
- FieldTrial::MakeName("Net.Transaction_Connected_New",
+ base::FieldTrial::MakeName("Net.Transaction_Connected_New",
"ConnCountImpact"),
total_duration,
base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(10),
@@ -988,17 +988,19 @@ void HttpNetworkTransaction::LogTransactionConnectedMetrics() {
}
}
- static bool use_spdy_histogram(FieldTrialList::Find("SpdyImpact") &&
- !FieldTrialList::Find("SpdyImpact")->group_name().empty());
+ 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(
- FieldTrial::MakeName("Net.Transaction_Connected_Under_10", "SpdyImpact"),
+ base::FieldTrial::MakeName("Net.Transaction_Connected_Under_10",
+ "SpdyImpact"),
total_duration, base::TimeDelta::FromMilliseconds(1),
base::TimeDelta::FromMinutes(10), 100);
if (!reused_socket) {
UMA_HISTOGRAM_CLIPPED_TIMES(
- FieldTrial::MakeName("Net.Transaction_Connected_New", "SpdyImpact"),
+ base::FieldTrial::MakeName("Net.Transaction_Connected_New",
+ "SpdyImpact"),
total_duration, base::TimeDelta::FromMilliseconds(1),
base::TimeDelta::FromMinutes(10), 100);
}
diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc
index 512f509..0e7610c 100644
--- a/net/http/http_stream_parser.cc
+++ b/net/http/http_stream_parser.cc
@@ -5,7 +5,7 @@
#include "net/http/http_stream_parser.h"
#include "base/compiler_specific.h"
-#include "base/histogram.h"
+#include "base/metrics/histogram.h"
#include "net/base/auth.h"
#include "net/base/io_buffer.h"
#include "net/base/ssl_cert_request_info.h"
generated by cgit v1.1 at 2025-03-05 11:17:22 +0000