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

Unified Diff: chrome/browser/chrome_browser_main.h

Issue 12886034: Remove experimental code to pick the "warmest" socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync, fix conflict Created 7 years, 9 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 | « chrome/browser/chrome_browser_field_trials.cc ('k') | chrome/browser/chrome_browser_main_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.h
===================================================================
--- chrome/browser/chrome_browser_main.h (revision 191149)
+++ chrome/browser/chrome_browser_main.h (working copy)
@@ -6,9 +6,7 @@
#define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
#include "base/basictypes.h"
-#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
#include "base/metrics/field_trial.h"
#include "base/tracked_objects.h"
#include "chrome/browser/chrome_browser_field_trials.h"
@@ -199,11 +197,6 @@
// network stack, as this can only be done once.
static bool disable_enforcing_cookie_policies_for_tests_;
- friend class BrowserMainTest;
- FRIEND_TEST_ALL_PREFIXES(BrowserMainTest,
- WarmConnectionFieldTrial_WarmestSocket);
- FRIEND_TEST_ALL_PREFIXES(BrowserMainTest, WarmConnectionFieldTrial_Random);
- FRIEND_TEST_ALL_PREFIXES(BrowserMainTest, WarmConnectionFieldTrial_Invalid);
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
};
« no previous file with comments | « chrome/browser/chrome_browser_field_trials.cc ('k') | chrome/browser/chrome_browser_main_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698