Landing Recent QUIC changes until Fri Nov 18 23:21:04 2016 +0000

chrome/browser/io_thread_unittest.cc

 // Copyright 2014 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 <stddef.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 12 matching lines @@
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/features/features.h"
 #include "net/cert_net/nss_ocsp.h"
 #include "net/http/http_auth_preferences.h"
 #include "net/http/http_auth_scheme.h"
 #include "net/http/http_network_session.h"
 #include "net/quic/chromium/quic_stream_factory.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_tag.h"
+#include "net/quic/core/quic_versions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_handler.h"
@@ skipping 416 matching lines @@
   command_line_.AppendSwitchASCII("testing-fixed-http-port", "42");
   command_line_.AppendSwitchASCII("testing-fixed-https-port", "137");
 
   ConfigureParamsFromFieldTrialsAndCommandLine();
 
   EXPECT_EQ(42u, params_.testing_fixed_http_port);
   EXPECT_EQ(137u, params_.testing_fixed_https_port);
 }
 
 }  // namespace test