Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2216)

Unified Diff: chrome/browser/browser_main.cc

Issue 7576009: Merge 95232 - WebSocket: Remove obsolete experiments related files (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/profiles/profile.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc (revision 95449)
+++ chrome/browser/browser_main.cc (working copy)
@@ -57,7 +57,6 @@
#include "chrome/browser/net/chrome_net_log.h"
#include "chrome/browser/net/predictor_api.h"
#include "chrome/browser/net/sdch_dictionary_fetcher.h"
-#include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h"
#include "chrome/browser/plugin_updater.h"
#include "chrome/browser/policy/browser_policy_connector.h"
#include "chrome/browser/prefs/pref_service.h"
@@ -633,9 +632,6 @@
void BrowserMainParts::SetupFieldTrials(bool metrics_recording_enabled,
bool proxy_policy_is_set) {
- if (metrics_recording_enabled)
- chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Start();
-
// Note: make sure to call ConnectionFieldTrial() before
// ProxyConnectionsFieldTrial().
ConnectionFieldTrial();
@@ -2090,8 +2086,6 @@
translate_manager->CleanupPendingUlrFetcher();
- chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Stop();
-
process_singleton.Cleanup();
// Stop all tasks that might run on WatchDogThread.
« no previous file with comments | « no previous file | chrome/browser/profiles/profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698