OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
643 IsIncludedInPromoFieldTrial()) | 643 IsIncludedInPromoFieldTrial()) |
644 drp_flags |= data_reduction_proxy::DataReductionProxyParams::kPromoAllowed; | 644 drp_flags |= data_reduction_proxy::DataReductionProxyParams::kPromoAllowed; |
645 if (data_reduction_proxy::DataReductionProxyParams:: | 645 if (data_reduction_proxy::DataReductionProxyParams:: |
646 IsIncludedInHoldbackFieldTrial()) | 646 IsIncludedInHoldbackFieldTrial()) |
647 drp_flags |= data_reduction_proxy::DataReductionProxyParams::kHoldback; | 647 drp_flags |= data_reduction_proxy::DataReductionProxyParams::kHoldback; |
648 globals_->data_reduction_proxy_params.reset( | 648 globals_->data_reduction_proxy_params.reset( |
649 new data_reduction_proxy::DataReductionProxyParams(drp_flags)); | 649 new data_reduction_proxy::DataReductionProxyParams(drp_flags)); |
650 globals_->data_reduction_proxy_auth_request_handler.reset( | 650 globals_->data_reduction_proxy_auth_request_handler.reset( |
651 new data_reduction_proxy::DataReductionProxyAuthRequestHandler( | 651 new data_reduction_proxy::DataReductionProxyAuthRequestHandler( |
652 DataReductionProxyChromeSettings::GetClient(), | 652 DataReductionProxyChromeSettings::GetClient(), |
653 chrome::VersionInfo().Version(), | |
654 globals_->data_reduction_proxy_params.get(), | 653 globals_->data_reduction_proxy_params.get(), |
655 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); | 654 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); |
656 globals_->data_reduction_proxy_delegate.reset( | 655 globals_->data_reduction_proxy_delegate.reset( |
657 new data_reduction_proxy::DataReductionProxyDelegate( | 656 new data_reduction_proxy::DataReductionProxyDelegate( |
658 globals_->data_reduction_proxy_auth_request_handler.get())); | 657 globals_->data_reduction_proxy_auth_request_handler.get())); |
659 // This is the same as in ProfileImplIOData except that we do not collect | 658 // This is the same as in ProfileImplIOData except that we do not collect |
660 // usage stats. | 659 // usage stats. |
661 network_delegate->set_data_reduction_proxy_params( | 660 network_delegate->set_data_reduction_proxy_params( |
662 globals_->data_reduction_proxy_params.get()); | 661 globals_->data_reduction_proxy_params.get()); |
663 network_delegate->set_data_reduction_proxy_auth_request_handler( | 662 network_delegate->set_data_reduction_proxy_auth_request_handler( |
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1430 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); | 1429 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); |
1431 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1430 for (size_t i = 0; i < supported_versions.size(); ++i) { |
1432 net::QuicVersion version = supported_versions[i]; | 1431 net::QuicVersion version = supported_versions[i]; |
1433 if (net::QuicVersionToString(version) == quic_version) { | 1432 if (net::QuicVersionToString(version) == quic_version) { |
1434 return version; | 1433 return version; |
1435 } | 1434 } |
1436 } | 1435 } |
1437 | 1436 |
1438 return net::QUIC_VERSION_UNSUPPORTED; | 1437 return net::QUIC_VERSION_UNSUPPORTED; |
1439 } | 1438 } |
OLD | NEW |