QUIC - minor cleanup of the following field trials and used defaults for

chrome/browser/io_thread.h

 // 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.
 
 #ifndef CHROME_BROWSER_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 168 matching lines @@
     Optional<bool> force_spdy_always;
     std::set<net::HostPortPair> forced_spdy_exclusions;
     Optional<bool> use_alternate_protocols;
     Optional<double> alternate_protocol_probability_threshold;
 
     Optional<bool> enable_quic;
     Optional<bool> enable_quic_for_proxies;
     Optional<bool> enable_quic_port_selection;
     Optional<bool> quic_always_require_handshake_confirmation;
     Optional<bool> quic_disable_connection_pooling;
-    Optional<int> quic_load_server_info_timeout_ms;
     Optional<float> quic_load_server_info_timeout_srtt_multiplier;
-    Optional<bool> quic_enable_truncated_connection_ids;
     Optional<bool> quic_enable_connection_racing;
     Optional<bool> quic_enable_non_blocking_io;
     Optional<bool> quic_disable_disk_cache;
     Optional<int> quic_socket_receive_buffer_size;
     Optional<size_t> quic_max_packet_length;
     net::QuicTagVector quic_connection_options;
     Optional<std::string> quic_user_agent_id;
     Optional<net::QuicVersionVector> quic_supported_versions;
     Optional<net::HostPortPair> origin_to_force_quic_on;
     bool enable_user_alternate_protocol_ports;
@@ skipping 157 matching lines @@
 
   // Returns true if QUIC should always require handshake confirmation during
   // the QUIC handshake.
   static bool ShouldQuicAlwaysRequireHandshakeConfirmation(
       const VariationParameters& quic_trial_params);
 
   // Returns true if QUIC should disable connection pooling.
   static bool ShouldQuicDisableConnectionPooling(
       const VariationParameters& quic_trial_params);
 
-  // Returns the timeout value for loading of QUIC sever information from disk
-  // cache based on field trial. Returns 0 if there is an error parsing the
-  // field trial params, or if the default value should be used.
-  static int GetQuicLoadServerInfoTimeout(
-      const VariationParameters& quic_trial_params);
-
   // Returns the ratio of time to load QUIC sever information from disk cache to
   // 'smoothed RTT' based on field trial. Returns 0 if there is an error parsing
   // the field trial params, or if the default value should be used.
   static float GetQuicLoadServerInfoTimeoutSrttMultiplier(
       const VariationParameters& quic_trial_params);
 
-  // Returns true if QUIC's TruncatedConnectionIds should be enabled.
-  static bool ShouldQuicEnableTruncatedConnectionIds(
-      const VariationParameters& quic_trial_params);
-
   // Returns true if QUIC's connection racing should be enabled.
   static bool ShouldQuicEnableConnectionRacing(
       const VariationParameters& quic_trial_params);
 
   // Returns true if QUIC's should use non-blocking IO.
   static bool ShouldQuicEnableNonBlockingIO(
       const VariationParameters& quic_trial_params);
 
   // Returns true if QUIC shouldn't load QUIC server information from the disk
   // cache.
@@ skipping 89 matching lines @@
   bool is_spdy_disabled_by_policy_;
 
   const base::TimeTicks creation_time_;
 
   base::WeakPtrFactory<IOThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_