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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 10261013: SPDY - Don't add any users into SPDY/3 experiment in (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 } else if (parsed_command_line().HasSwitch(switches::kEnableNpn)) { 782 } else if (parsed_command_line().HasSwitch(switches::kEnableNpn)) {
783 net::HttpStreamFactory::EnableNpnSpdy(); 783 net::HttpStreamFactory::EnableNpnSpdy();
784 use_field_trial = false; 784 use_field_trial = false;
785 } else if (parsed_command_line().HasSwitch(switches::kEnableNpnHttpOnly)) { 785 } else if (parsed_command_line().HasSwitch(switches::kEnableNpnHttpOnly)) {
786 net::HttpStreamFactory::EnableNpnHttpOnly(); 786 net::HttpStreamFactory::EnableNpnHttpOnly();
787 use_field_trial = false; 787 use_field_trial = false;
788 } 788 }
789 if (use_field_trial) { 789 if (use_field_trial) {
790 const base::FieldTrial::Probability kSpdyDivisor = 100; 790 const base::FieldTrial::Probability kSpdyDivisor = 100;
791 base::FieldTrial::Probability npnhttp_probability = 5; 791 base::FieldTrial::Probability npnhttp_probability = 5;
792 base::FieldTrial::Probability spdy3_probability = 50; 792 base::FieldTrial::Probability spdy3_probability = 0;
793 793
794 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); 794 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
795 if (channel == chrome::VersionInfo::CHANNEL_CANARY || 795 if (channel == chrome::VersionInfo::CHANNEL_CANARY ||
796 channel == chrome::VersionInfo::CHANNEL_UNKNOWN) { 796 channel == chrome::VersionInfo::CHANNEL_UNKNOWN) {
797 // 5% is for HTTP (no SPDY) and 5% for default SPDY (SPDY/2). 797 // 5% is for HTTP (no SPDY) and 5% for default SPDY (SPDY/2).
798 spdy3_probability = 90; 798 spdy3_probability = 90;
799 } else if (channel == chrome::VersionInfo::CHANNEL_DEV) {
800 spdy3_probability = 50;
799 } 801 }
800 802
801 #if defined(OS_CHROMEOS) 803 #if defined(OS_CHROMEOS)
802 // Always enable SPDY (spdy/2 or spdy/3) on Chrome OS 804 // Always enable SPDY (spdy/2 or spdy/3) on Chrome OS
803 npnhttp_probability = 0; 805 npnhttp_probability = 0;
804 #endif // !defined(OS_CHROMEOS) 806 #endif // !defined(OS_CHROMEOS)
805 807
806 // NPN with spdy support is the default. 808 // NPN with spdy support is the default.
807 int npn_spdy_grp = -1; 809 int npn_spdy_grp = -1;
808 810
(...skipping 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1979 if (base::win::GetVersion() <= base::win::VERSION_XP) 1981 if (base::win::GetVersion() <= base::win::VERSION_XP)
1980 uma_name += "_XP"; 1982 uma_name += "_XP";
1981 1983
1982 uma_name += "_PreRead_"; 1984 uma_name += "_PreRead_";
1983 uma_name += pre_read_percentage; 1985 uma_name += pre_read_percentage;
1984 AddPreReadHistogramTime(uma_name.c_str(), time); 1986 AddPreReadHistogramTime(uma_name.c_str(), time);
1985 } 1987 }
1986 #endif 1988 #endif
1987 #endif 1989 #endif
1988 } 1990 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698