Created policy QuicAllowed

chrome/browser/io_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/io_thread.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 440 matching lines @@
     PrefService* local_state,
     policy::PolicyService* policy_service,
     ChromeNetLog* net_log,
     extensions::EventRouterForwarder* extension_event_router_forwarder)
     : net_log_(net_log),
 #if defined(ENABLE_EXTENSIONS)
       extension_event_router_forwarder_(extension_event_router_forwarder),
 #endif
       globals_(NULL),
       is_spdy_disabled_by_policy_(false),
+      is_quic_enabled_by_policy_(true),
       creation_time_(base::TimeTicks::Now()),
       weak_factory_(this) {
   auth_schemes_ = local_state->GetString(prefs::kAuthSchemes);
   negotiate_disable_cname_lookup_ = local_state->GetBoolean(
       prefs::kDisableAuthNegotiateCnameLookup);
   negotiate_enable_port_ = local_state->GetBoolean(
       prefs::kEnableAuthNegotiatePort);
   auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist);
   auth_delegate_whitelist_ = local_state->GetString(
       prefs::kAuthNegotiateDelegateWhitelist);
@@ skipping 27 matching lines @@
 
   quick_check_enabled_.Init(prefs::kQuickCheckEnabled,
                             local_state);
   quick_check_enabled_.MoveToThread(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   is_spdy_disabled_by_policy_ = policy_service->GetPolicies(
       policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, std::string())).Get(
           policy::key::kDisableSpdy) != NULL;
+  const base::Value* v =  policy_service->GetPolicies(

[Andrew T Wilson (Slow), 2015/03/12 17:23:33]

remove extra space after =

[Andrew T Wilson (Slow), 2015/03/12 17:23:34]

Can this policy be changed on the fly, or only on startup?

[peletskyi, 2015/03/13 12:00:40]

Done.

[peletskyi, 2015/03/13 12:00:40]

Done.

[peletskyi, 2015/03/13 12:00:40]

Only on startup

[Andrew T Wilson (Slow), 2015/03/13 14:00:51]

OK, ideally all new policies would allow changing this dynamically. Is this
feasible in this case?

[peletskyi, 2015/03/18 15:42:30]

It will be rather complicated. Currently I don't know any use case where QUIC is
enabled or disabled on the fly.

+        policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME,
+          std::string())).GetValue(policy::key::kQuicEnabled);

[Andrew T Wilson (Slow), 2015/03/12 17:23:33]

nit: indent is off

[peletskyi, 2015/03/13 12:00:40]

Done.

+  if (v != nullptr) {
+    v->GetAsBoolean(&is_quic_enabled_by_policy_);
+  }
 #endif  // ENABLE_CONFIGURATION_POLICY
 
   BrowserThread::SetDelegate(BrowserThread::IO, this);
 }
 
 IOThread::~IOThread() {
   // This isn't needed for production code, but in tests, IOThread may
   // be multiply constructed.
   BrowserThread::SetDelegate(BrowserThread::IO, NULL);
 
@@ skipping 630 matching lines @@
   // Always fetch the field trial group to ensure it is reported correctly.
   // The command line flags will be associated with a group that is reported
   // so long as trial is actually queried.
   std::string group =
       base::FieldTrialList::FindFullName(kQuicFieldTrialName);
   VariationParameters params;
   if (!variations::GetVariationParams(kQuicFieldTrialName, &params)) {
     params.clear();
   }
 
-  ConfigureQuicGlobals(command_line, group, params, globals_);
+  ConfigureQuicGlobals(command_line, group, params, is_quic_enabled_by_policy_,
+      globals_);
 }
 
 // static
 void IOThread::ConfigureQuicGlobals(
     const base::CommandLine& command_line,
     base::StringPiece quic_trial_group,
     const VariationParameters& quic_trial_params,
+    bool quic_enabled_by_policy,
     IOThread::Globals* globals) {
-  bool enable_quic = ShouldEnableQuic(command_line, quic_trial_group);
+  bool enable_quic = ShouldEnableQuic(command_line,
+      quic_trial_group, quic_enabled_by_policy);
   globals->enable_quic.set(enable_quic);
   bool enable_quic_for_proxies = ShouldEnableQuicForProxies(command_line,
-                                                            quic_trial_group);
+      quic_trial_group, quic_enabled_by_policy);
   globals->enable_quic_for_proxies.set(enable_quic_for_proxies);
   if (enable_quic) {
     globals->quic_always_require_handshake_confirmation.set(
         ShouldQuicAlwaysRequireHandshakeConfirmation(quic_trial_params));
     globals->quic_disable_connection_pooling.set(
         ShouldQuicDisableConnectionPooling(quic_trial_params));
     int receive_buffer_size = GetQuicSocketReceiveBufferSize(quic_trial_params);
     if (receive_buffer_size != 0) {
       globals->quic_socket_receive_buffer_size.set(receive_buffer_size);
     }
@@ skipping 51 matching lines @@
     net::HostPortPair quic_origin =
         net::HostPortPair::FromString(
             command_line.GetSwitchValueASCII(switches::kOriginToForceQuicOn));
     if (!quic_origin.IsEmpty()) {
       globals->origin_to_force_quic_on.set(quic_origin);
     }
   }
 }
 
 bool IOThread::ShouldEnableQuic(const base::CommandLine& command_line,
-                                base::StringPiece quic_trial_group) {
-  if (command_line.HasSwitch(switches::kDisableQuic))
+                                base::StringPiece quic_trial_group,
+                                bool quic_enabled_by_policy) {

[Andrew T Wilson (Slow), 2015/03/12 17:23:33]

So, I think this should be called "quic_disabled_by_policy" and you should have
all the logic as if the original policy is "DisableQuic" - just change the code
that sets quic_disabled_by_policy to correctly map from the policy value to
this.

Otherwise it's too confusing, because an unset policy means
quic_enabled_by_policy == true, which is icky.

[peletskyi, 2015/03/13 12:00:40]

According to new name this variable is called "quic_allowed_by_policy_". I think
it is OK.

+  if (command_line.HasSwitch(switches::kDisableQuic) || !quic_enabled_by_policy)
     return false;
 
   if (command_line.HasSwitch(switches::kEnableQuic))
     return true;
 
   return quic_trial_group.starts_with(kQuicFieldTrialEnabledGroupName) ||
       quic_trial_group.starts_with(kQuicFieldTrialHttpsEnabledGroupName);
 }
 
 // static
 bool IOThread::ShouldEnableQuicForProxies(const base::CommandLine& command_line,
-                                          base::StringPiece quic_trial_group) {
-  return ShouldEnableQuic(command_line, quic_trial_group) ||
-      ShouldEnableQuicForDataReductionProxy();
+                                          base::StringPiece quic_trial_group,
+                                          bool quic_enabled_by_policy) {
+  return ShouldEnableQuic(command_line, quic_trial_group,
+      quic_enabled_by_policy) ||  ShouldEnableQuicForDataReductionProxy();
 }
 
 // static
 bool IOThread::ShouldEnableQuicForDataReductionProxy() {
   const base::CommandLine& command_line =
         *base::CommandLine::ForCurrentProcess();
 
   if (command_line.HasSwitch(switches::kDisableQuic))
     return false;
 
@@ skipping 173 matching lines @@
   net::QuicVersionVector supported_versions = net::QuicSupportedVersions();
   for (size_t i = 0; i < supported_versions.size(); ++i) {
     net::QuicVersion version = supported_versions[i];
     if (net::QuicVersionToString(version) == quic_version) {
       return version;
     }
   }
 
   return net::QUIC_VERSION_UNSUPPORTED;
 }