Chromium Code Reviews| Index: chrome/browser/io_thread.h |
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h |
| index 0da6e86de6fc096f37a34eba22ba6a265fd1e4cf..2c90e3e810af045bee0f5b3e00f4b0bc18a7dcff 100644 |
| --- a/chrome/browser/io_thread.h |
| +++ b/chrome/browser/io_thread.h |
| @@ -330,19 +330,22 @@ class IOThread : public content::BrowserThreadDelegate { |
| const base::CommandLine& command_line, |
| base::StringPiece quic_trial_group, |
| const VariationParameters& quic_trial_params, |
| + bool quic_allowed_by_policy, |
| Globals* globals); |
|
Ryan Hamilton
2015/03/18 18:42:54
Can you add tests for this new logic in io_thread_
peletskyi
2015/03/20 17:54:47
Done.
|
| // Returns true if QUIC should be enabled, either as a result |
| // of a field trial or a command line flag. |
| static bool ShouldEnableQuic( |
| const base::CommandLine& command_line, |
| - base::StringPiece quic_trial_group); |
| + base::StringPiece quic_trial_group, |
| + bool quic_allowed_by_policy); |
| // Returns true if QUIC should be enabled for proxies, either as a result |
| // of a field trial or a command line flag. |
| static bool ShouldEnableQuicForProxies( |
| const base::CommandLine& command_line, |
| - base::StringPiece quic_trial_group); |
| + base::StringPiece quic_trial_group, |
| + bool quic_allowed_by_policy); |
| // Returns true if the selection of the ephemeral port in bind() should be |
| // performed by Chromium, and false if the OS should select the port. The OS |
| @@ -473,6 +476,9 @@ class IOThread : public content::BrowserThreadDelegate { |
| // True if SPDY is disabled by policy. |
| bool is_spdy_disabled_by_policy_; |
| + // True if QUIC is allowed by policy. |
| + bool is_quic_allowed_by_policy_; |
|
Ryan Hamilton
2015/03/18 18:42:54
heh, it's unfortunate that the polarity of this po
peletskyi
2015/03/20 17:54:47
Unfortunately one is not allowed not give name "Qu
|
| + |
| const base::TimeTicks creation_time_; |
| base::WeakPtrFactory<IOThread> weak_factory_; |