summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net/websocket_experiment
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 /chrome/browser/net/websocket_experiment
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 'chrome/browser/net/websocket_experiment')
-rw-r--r--chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc8
-rw-r--r--chrome/browser/net/websocket_experiment/websocket_experiment_runner.h1
-rw-r--r--chrome/browser/net/websocket_experiment/websocket_experiment_task.cc5
3 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc b/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc
index 692d4d0..e09febc 100644
--- a/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc
+++ b/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc
@@ -6,8 +6,8 @@
#include "base/command_line.h"
#include "base/compiler_specific.h"
-#include "base/field_trial.h"
#include "base/message_loop.h"
+#include "base/metrics/field_trial.h"
#include "base/task.h"
#include "base/string_util.h"
#include "chrome/browser/browser_thread.h"
@@ -28,10 +28,12 @@ static scoped_refptr<WebSocketExperimentRunner> runner;
void WebSocketExperimentRunner::Start() {
DCHECK(!runner.get());
- scoped_refptr<FieldTrial> trial = new FieldTrial("WebSocketExperiment", 1000);
+ scoped_refptr<base::FieldTrial> trial =
+ new base::FieldTrial("WebSocketExperiment", 1000);
trial->AppendGroup("active", 5); // 0.5% in active group.
- bool run_experiment = (trial->group() != FieldTrial::kNotParticipating);
+ bool run_experiment =
+ (trial->group() != base::FieldTrial::kNotParticipating);
#ifndef NDEBUG
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
std::string experiment_host = command_line.GetSwitchValueASCII(
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_runner.h b/chrome/browser/net/websocket_experiment/websocket_experiment_runner.h
index 16b20f0..785b5cf 100644
--- a/chrome/browser/net/websocket_experiment/websocket_experiment_runner.h
+++ b/chrome/browser/net/websocket_experiment/websocket_experiment_runner.h
@@ -16,7 +16,6 @@
#pragma once
#include "base/basictypes.h"
-#include "base/histogram.h"
#include "base/linked_ptr.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
index cc7929c..6279615 100644
--- a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
+++ b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/net/websocket_experiment/websocket_experiment_task.h"
#include "base/hash_tables.h"
-#include "base/histogram.h"
+#include "base/metrics/histogram.h"
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/profile.h"
#include "chrome/common/net/url_request_context_getter.h"
@@ -14,6 +14,9 @@
#include "net/base/net_errors.h"
#include "net/websockets/websocket.h"
+using base::Histogram;
+using base::LinearHistogram;
+
namespace chrome_browser_net_websocket_experiment {
static std::string GetProtocolVersionName(