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

net/tools/quic/quic_simple_client_bin.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.
 
 // A binary wrapper for QuicClient.
 // Connects to a host using QUIC, sends a request to the provided URL, and
 // displays the response.
 //
 // Some usage examples:
 //
@@ skipping 147 matching lines @@
   }
   if (line->HasSwitch("redirect_is_success")) {
     FLAGS_redirect_is_success = true;
   }
   if (line->HasSwitch("initial_mtu")) {
     if (!base::StringToInt(line->GetSwitchValueASCII("initial_mtu"),
                            &FLAGS_initial_mtu)) {
       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
           << " body: " << FLAGS_body << " headers: " << FLAGS_headers
           << " quiet: " << FLAGS_quiet
           << " quic-version: " << FLAGS_quic_version
           << " version_mismatch_ok: " << FLAGS_version_mismatch_ok
           << " redirect_is_success: " << FLAGS_redirect_is_success
           << " initial_mtu: " << FLAGS_initial_mtu;
 
@@ skipping 30 matching lines @@
                               net::PRIVACY_MODE_DISABLED);
   net::QuicVersionVector versions = net::QuicSupportedVersions();
   if (FLAGS_quic_version != -1) {
     versions.clear();
     versions.push_back(static_cast<net::QuicVersion>(FLAGS_quic_version));
   }
   net::tools::QuicSimpleClient client(net::IPEndPoint(ip_addr, FLAGS_port),
                                       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());
     transport_security_state.reset(new TransportSecurityState);
     client.SetProofVerifier(new ProofVerifierChromium(
         cert_verifier.get(), transport_security_state.get()));
   }
   if (!client.Initialize()) {
     cerr << "Failed to initialize client." << endl;
     return 1;
@@ skipping 70 matching lines @@
       return 0;
     } else {
       cout << "Request failed (redirect " << response_code << ")." << endl;
       return 1;
     }
   } else {
     cerr << "Request failed (" << response_code << ")." << endl;
     return 1;
   }
 }