QUIC - clean up changes to keep internal source and chromium code in sync.

net/tools/quic/quic_simple_client_bin.cc

Index: net/tools/quic/quic_simple_client_bin.cc
diff --git a/net/tools/quic/quic_simple_client_bin.cc b/net/tools/quic/quic_simple_client_bin.cc
index ec74cc935b516ac983471caf3c5cb3f41be65c79..36f40d5e74439115bce26940f20ca56907226fa9 100644
--- a/net/tools/quic/quic_simple_client_bin.cc
+++ b/net/tools/quic/quic_simple_client_bin.cc
@@ -165,10 +165,6 @@ int main(int argc, char *argv[]) {
       std::cerr << "--initial_mtu must be an integer\n";
       return 1;
     }
-  } else {
-    // Default and initial maximum size in bytes of a QUIC packet, which is used
-    // to set connection's max_packet_length.
-    FLAGS_initial_mtu = net::kDefaultMaxPacketSize;
   }
 
   VLOG(1) << "server host: " << FLAGS_host << " port: " << FLAGS_port
@@ -219,9 +215,8 @@ int main(int argc, char *argv[]) {
                                       server_id, versions);
   scoped_ptr<CertVerifier> cert_verifier;
   scoped_ptr<TransportSecurityState> transport_security_state;
-  if (FLAGS_initial_mtu != 0) {
-    client.set_initial_max_packet_length(FLAGS_initial_mtu);
-  }
+  client.set_initial_max_packet_length(
+      FLAGS_initial_mtu != 0 ? FLAGS_initial_mtu : net::kDefaultMaxPacketSize);
   if (is_https) {
     // For secure QUIC we need to verify the cert chain.a
     cert_verifier.reset(CertVerifier::CreateDefault());