| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/data_reduction_proxy/browser/data_reduction_proxy_params.h" | 5 #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 697 false, | 697 false, |
| 698 false, | 698 false, |
| 699 false, | 699 false, |
| 700 false, | 700 false, |
| 701 // expected result | 701 // expected result |
| 702 false, | 702 false, |
| 703 }, | 703 }, |
| 704 { // proxy flags | 704 { // proxy flags |
| 705 false, | 705 false, |
| 706 false, | 706 false, |
| 707 false, | 707 true, |
| 708 // is https request | 708 // is https request |
| 709 true, | 709 true, |
| 710 // proxies in retry map | 710 // proxies in retry map |
| 711 false, | 711 false, |
| 712 false, | 712 false, |
| 713 false, | 713 false, |
| 714 false, | 714 false, |
| 715 true, | 715 true, |
| 716 // expected result | 716 // expected result |
| 717 false, | 717 true, |
| 718 }, | 718 }, |
| 719 { // proxy flags | 719 { // proxy flags |
| 720 false, | 720 true, |
| 721 false, | 721 true, |
| 722 true, | 722 true, |
| 723 // is https request | 723 // is https request |
| 724 true, | 724 true, |
| 725 // proxies in retry map | 725 // proxies in retry map |
| 726 false, | 726 false, |
| 727 false, | 727 false, |
| 728 false, | 728 false, |
| 729 false, | 729 false, |
| 730 true, | 730 true, |
| 731 // expected result | 731 // expected result |
| 732 true, | 732 true, |
| 733 }, | 733 }, |
| 734 { // proxy flags | 734 { // proxy flags |
| 735 true, | 735 true, |
| 736 true, | |
| 737 true, | |
| 738 // is https request | |
| 739 true, | |
| 740 // proxies in retry map | |
| 741 false, | |
| 742 false, | |
| 743 false, | |
| 744 false, | |
| 745 true, | |
| 746 // expected result | |
| 747 true, | |
| 748 }, | |
| 749 { // proxy flags | |
| 750 true, | |
| 751 false, | 736 false, |
| 752 false, | 737 false, |
| 753 // is https request | 738 // is https request |
| 754 false, | 739 false, |
| 755 // proxies in retry map | 740 // proxies in retry map |
| 756 true, | 741 true, |
| 757 false, | 742 false, |
| 758 false, | 743 false, |
| 759 false, | 744 false, |
| 760 false, | 745 false, |
| 761 // expected result | 746 // expected result |
| 762 true, | 747 true, |
| 748 }, |
| 749 { // proxy flags |
| 750 true, |
| 751 true, |
| 752 false, |
| 753 // is https request |
| 754 false, |
| 755 // proxies in retry map |
| 756 false, |
| 757 true, |
| 758 false, |
| 759 false, |
| 760 false, |
| 761 // expected result |
| 762 true, |
| 763 }, |
| 764 { // proxy flags |
| 765 false, |
| 766 true, |
| 767 true, |
| 768 // is https request |
| 769 false, |
| 770 // proxies in retry map |
| 771 false, |
| 772 false, |
| 773 false, |
| 774 true, |
| 775 false, |
| 776 // expected result |
| 777 true, |
| 763 }, | 778 }, |
| 764 { // proxy flags | 779 { // proxy flags |
| 765 true, | 780 true, |
| 766 true, | 781 true, |
| 767 false, | 782 false, |
| 768 // is https request | 783 // is https request |
| 769 false, | 784 false, |
| 770 // proxies in retry map | 785 // proxies in retry map |
| 771 true, | 786 true, |
| 772 false, | 787 false, |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 968 retry_map[ssl_origin] = retry_info; | 983 retry_map[ssl_origin] = retry_info; |
| 969 | 984 |
| 970 bool was_bypassed = params.AreProxiesBypassed(retry_map, | 985 bool was_bypassed = params.AreProxiesBypassed(retry_map, |
| 971 tests[i].is_https, | 986 tests[i].is_https, |
| 972 NULL); | 987 NULL); |
| 973 | 988 |
| 974 EXPECT_EQ(tests[i].expected_result, was_bypassed); | 989 EXPECT_EQ(tests[i].expected_result, was_bypassed); |
| 975 } | 990 } |
| 976 } | 991 } |
| 977 } // namespace data_reduction_proxy | 992 } // namespace data_reduction_proxy |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 464023002:
Fixed DataReductionProxyParams::AreProxiesBypassed logic (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master