| 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 <map> | 5 #include <map> |
| 6 #include <queue> | 6 #include <queue> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| 11 #include "base/json/json_string_value_serializer.h" | 11 #include "base/json/json_string_value_serializer.h" |
| 12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
| 13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
| 14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
| 15 #include "base/stl_util.h" | 15 #include "base/stl_util.h" |
| 16 #include "base/utf_string_conversions.h" | 16 #include "base/utf_string_conversions.h" |
| 17 #include "chrome/browser/api/prefs/pref_member.h" | 17 #include "chrome/browser/api/prefs/pref_member.h" |
| 18 #include "chrome/browser/content_settings/cookie_settings.h" | 18 #include "chrome/browser/content_settings/cookie_settings.h" |
| 19 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 19 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
| 20 #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h" | 20 #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h" |
| 21 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" | 21 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" |
| 22 #include "chrome/browser/extensions/event_router_forwarder.h" | 22 #include "chrome/browser/extensions/event_router_forwarder.h" |
| 23 #include "chrome/browser/extensions/extension_warning_set.h" |
| 23 #include "chrome/browser/net/chrome_network_delegate.h" | 24 #include "chrome/browser/net/chrome_network_delegate.h" |
| 24 #include "chrome/common/extensions/extension_messages.h" | 25 #include "chrome/common/extensions/extension_messages.h" |
| 25 #include "chrome/common/pref_names.h" | 26 #include "chrome/common/pref_names.h" |
| 26 #include "chrome/test/base/testing_browser_process.h" | 27 #include "chrome/test/base/testing_browser_process.h" |
| 27 #include "chrome/test/base/testing_pref_service.h" | 28 #include "chrome/test/base/testing_pref_service.h" |
| 28 #include "chrome/test/base/testing_profile.h" | 29 #include "chrome/test/base/testing_profile.h" |
| 29 #include "content/public/test/test_browser_thread.h" | 30 #include "content/public/test/test_browser_thread.h" |
| 30 #include "net/base/auth.h" | 31 #include "net/base/auth.h" |
| 31 #include "net/base/capturing_net_log.h" | 32 #include "net/base/capturing_net_log.h" |
| 32 #include "net/base/mock_host_resolver.h" | 33 #include "net/base/mock_host_resolver.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 } | 69 } |
| 69 | 70 |
| 70 // Searches |key| in |collection| by iterating over its elements and returns | 71 // Searches |key| in |collection| by iterating over its elements and returns |
| 71 // true if found. | 72 // true if found. |
| 72 template <typename Collection, typename Key> | 73 template <typename Collection, typename Key> |
| 73 bool Contains(const Collection& collection, const Key& key) { | 74 bool Contains(const Collection& collection, const Key& key) { |
| 74 return std::find(collection.begin(), collection.end(), key) != | 75 return std::find(collection.begin(), collection.end(), key) != |
| 75 collection.end(); | 76 collection.end(); |
| 76 } | 77 } |
| 77 | 78 |
| 79 // Returns whether |warnings| contains an extension for |extension_id|. |
| 80 bool HasWarning(const std::set<linked_ptr<ExtensionWarning> > warnings, |
| 81 const std::string& extension_id) { |
| 82 for (std::set<linked_ptr<ExtensionWarning> >::const_iterator i = |
| 83 warnings.begin(); |
| 84 i != warnings.end(); |
| 85 ++i) { |
| 86 if ((*i)->extension_id() == extension_id) |
| 87 return true; |
| 88 } |
| 89 return false; |
| 90 } |
| 91 |
| 78 } // namespace | 92 } // namespace |
| 79 | 93 |
| 80 // A mock event router that responds to events with a pre-arranged queue of | 94 // A mock event router that responds to events with a pre-arranged queue of |
| 81 // Tasks. | 95 // Tasks. |
| 82 class TestIPCSender : public IPC::Sender { | 96 class TestIPCSender : public IPC::Sender { |
| 83 public: | 97 public: |
| 84 typedef std::list<linked_ptr<IPC::Message> > SentMessages; | 98 typedef std::list<linked_ptr<IPC::Message> > SentMessages; |
| 85 | 99 |
| 86 // Adds a Task to the queue. We will fire these in order as events are | 100 // Adds a Task to the queue. We will fire these in order as events are |
| 87 // dispatched. | 101 // dispatched. |
| (...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 946 EXPECT_TRUE(delta->cancel); | 960 EXPECT_TRUE(delta->cancel); |
| 947 EXPECT_EQ(2u, delta->added_response_headers.size()); | 961 EXPECT_EQ(2u, delta->added_response_headers.size()); |
| 948 EXPECT_TRUE(Contains(delta->added_response_headers, | 962 EXPECT_TRUE(Contains(delta->added_response_headers, |
| 949 ResponseHeader("Key2", "Value1"))); | 963 ResponseHeader("Key2", "Value1"))); |
| 950 EXPECT_TRUE(Contains(delta->added_response_headers, | 964 EXPECT_TRUE(Contains(delta->added_response_headers, |
| 951 ResponseHeader("Key4", "Value4"))); | 965 ResponseHeader("Key4", "Value4"))); |
| 952 EXPECT_EQ(2u, delta->deleted_response_headers.size()); | 966 EXPECT_EQ(2u, delta->deleted_response_headers.size()); |
| 953 EXPECT_TRUE(Contains(delta->deleted_response_headers, | 967 EXPECT_TRUE(Contains(delta->deleted_response_headers, |
| 954 ResponseHeader("Key2", "Value2, Bar"))); | 968 ResponseHeader("Key2", "Value2, Bar"))); |
| 955 EXPECT_TRUE(Contains(delta->deleted_response_headers, | 969 EXPECT_TRUE(Contains(delta->deleted_response_headers, |
| 956 ResponseHeader("Key3", "Value3"))); | 970 ResponseHeader("Key3", "Value3"))); |
| 957 } | 971 } |
| 958 | 972 |
| 959 TEST(ExtensionWebRequestHelpersTest, TestCalculateOnAuthRequiredDelta) { | 973 TEST(ExtensionWebRequestHelpersTest, TestCalculateOnAuthRequiredDelta) { |
| 960 const bool cancel = true; | 974 const bool cancel = true; |
| 961 | 975 |
| 962 string16 username = ASCIIToUTF16("foo"); | 976 string16 username = ASCIIToUTF16("foo"); |
| 963 string16 password = ASCIIToUTF16("bar"); | 977 string16 password = ASCIIToUTF16("bar"); |
| 964 scoped_ptr<net::AuthCredentials> credentials( | 978 scoped_ptr<net::AuthCredentials> credentials( |
| 965 new net::AuthCredentials(username, password)); | 979 new net::AuthCredentials(username, password)); |
| 966 | 980 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 997 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1011 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 998 MergeCancelOfResponses(deltas, &canceled, &net_log); | 1012 MergeCancelOfResponses(deltas, &canceled, &net_log); |
| 999 EXPECT_TRUE(canceled); | 1013 EXPECT_TRUE(canceled); |
| 1000 EXPECT_EQ(1u, capturing_net_log.GetSize()); | 1014 EXPECT_EQ(1u, capturing_net_log.GetSize()); |
| 1001 } | 1015 } |
| 1002 | 1016 |
| 1003 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses) { | 1017 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses) { |
| 1004 EventResponseDeltas deltas; | 1018 EventResponseDeltas deltas; |
| 1005 net::CapturingBoundNetLog capturing_net_log; | 1019 net::CapturingBoundNetLog capturing_net_log; |
| 1006 net::BoundNetLog net_log = capturing_net_log.bound(); | 1020 net::BoundNetLog net_log = capturing_net_log.bound(); |
| 1007 std::set<std::string> conflicting_extensions; | 1021 ExtensionWarningSet warning_set; |
| 1022 std::set<linked_ptr<ExtensionWarning> > warnings; |
| 1008 GURL effective_new_url; | 1023 GURL effective_new_url; |
| 1009 | 1024 |
| 1010 // No redirect | 1025 // No redirect |
| 1011 linked_ptr<EventResponseDelta> d0( | 1026 linked_ptr<EventResponseDelta> d0( |
| 1012 new EventResponseDelta("extid0", base::Time::FromInternalValue(0))); | 1027 new EventResponseDelta("extid0", base::Time::FromInternalValue(0))); |
| 1013 deltas.push_back(d0); | 1028 deltas.push_back(d0); |
| 1014 MergeOnBeforeRequestResponses( | 1029 MergeOnBeforeRequestResponses( |
| 1015 deltas, &effective_new_url, &conflicting_extensions, &net_log); | 1030 deltas, &effective_new_url, &warning_set, &net_log); |
| 1016 EXPECT_TRUE(effective_new_url.is_empty()); | 1031 EXPECT_TRUE(effective_new_url.is_empty()); |
| 1017 | 1032 |
| 1018 // Single redirect. | 1033 // Single redirect. |
| 1019 GURL new_url_1("http://foo.com"); | 1034 GURL new_url_1("http://foo.com"); |
| 1020 linked_ptr<EventResponseDelta> d1( | 1035 linked_ptr<EventResponseDelta> d1( |
| 1021 new EventResponseDelta("extid1", base::Time::FromInternalValue(1000))); | 1036 new EventResponseDelta("extid1", base::Time::FromInternalValue(1000))); |
| 1022 d1->new_url = GURL(new_url_1); | 1037 d1->new_url = GURL(new_url_1); |
| 1023 deltas.push_back(d1); | 1038 deltas.push_back(d1); |
| 1024 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1039 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1025 capturing_net_log.Clear(); | 1040 capturing_net_log.Clear(); |
| 1026 MergeOnBeforeRequestResponses( | 1041 MergeOnBeforeRequestResponses( |
| 1027 deltas, &effective_new_url, &conflicting_extensions, &net_log); | 1042 deltas, &effective_new_url, &warning_set, &net_log); |
| 1043 warnings = warning_set.Release(); |
| 1028 EXPECT_EQ(new_url_1, effective_new_url); | 1044 EXPECT_EQ(new_url_1, effective_new_url); |
| 1029 EXPECT_TRUE(conflicting_extensions.empty()); | 1045 EXPECT_TRUE(warnings.empty()); |
| 1030 EXPECT_EQ(1u, capturing_net_log.GetSize()); | 1046 EXPECT_EQ(1u, capturing_net_log.GetSize()); |
| 1031 | 1047 |
| 1032 // Ignored redirect (due to precedence). | 1048 // Ignored redirect (due to precedence). |
| 1033 GURL new_url_2("http://bar.com"); | 1049 GURL new_url_2("http://bar.com"); |
| 1034 linked_ptr<EventResponseDelta> d2( | 1050 linked_ptr<EventResponseDelta> d2( |
| 1035 new EventResponseDelta("extid2", base::Time::FromInternalValue(500))); | 1051 new EventResponseDelta("extid2", base::Time::FromInternalValue(500))); |
| 1036 d2->new_url = GURL(new_url_2); | 1052 d2->new_url = GURL(new_url_2); |
| 1037 deltas.push_back(d2); | 1053 deltas.push_back(d2); |
| 1038 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1054 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1039 capturing_net_log.Clear(); | 1055 capturing_net_log.Clear(); |
| 1040 MergeOnBeforeRequestResponses( | 1056 MergeOnBeforeRequestResponses( |
| 1041 deltas, &effective_new_url, &conflicting_extensions, &net_log); | 1057 deltas, &effective_new_url, &warning_set, &net_log); |
| 1058 warnings = warning_set.Release(); |
| 1042 EXPECT_EQ(new_url_1, effective_new_url); | 1059 EXPECT_EQ(new_url_1, effective_new_url); |
| 1043 EXPECT_EQ(1u, conflicting_extensions.size()); | 1060 EXPECT_EQ(1u, warnings.size()); |
| 1044 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2")); | 1061 EXPECT_TRUE(HasWarning(warnings, "extid2")); |
| 1045 EXPECT_EQ(2u, capturing_net_log.GetSize()); | 1062 EXPECT_EQ(2u, capturing_net_log.GetSize()); |
| 1046 | 1063 |
| 1047 // Overriding redirect. | 1064 // Overriding redirect. |
| 1048 GURL new_url_3("http://baz.com"); | 1065 GURL new_url_3("http://baz.com"); |
| 1049 linked_ptr<EventResponseDelta> d3( | 1066 linked_ptr<EventResponseDelta> d3( |
| 1050 new EventResponseDelta("extid3", base::Time::FromInternalValue(1500))); | 1067 new EventResponseDelta("extid3", base::Time::FromInternalValue(1500))); |
| 1051 d3->new_url = GURL(new_url_3); | 1068 d3->new_url = GURL(new_url_3); |
| 1052 deltas.push_back(d3); | 1069 deltas.push_back(d3); |
| 1053 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1070 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1054 conflicting_extensions.clear(); | |
| 1055 capturing_net_log.Clear(); | 1071 capturing_net_log.Clear(); |
| 1056 MergeOnBeforeRequestResponses( | 1072 MergeOnBeforeRequestResponses( |
| 1057 deltas, &effective_new_url, &conflicting_extensions, &net_log); | 1073 deltas, &effective_new_url, &warning_set, &net_log); |
| 1074 warnings = warning_set.Release(); |
| 1058 EXPECT_EQ(new_url_3, effective_new_url); | 1075 EXPECT_EQ(new_url_3, effective_new_url); |
| 1059 EXPECT_EQ(2u, conflicting_extensions.size()); | 1076 EXPECT_EQ(2u, warnings.size()); |
| 1060 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid1")); | 1077 EXPECT_TRUE(HasWarning(warnings, "extid1")); |
| 1061 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2")); | 1078 EXPECT_TRUE(HasWarning(warnings, "extid2")); |
| 1062 EXPECT_EQ(3u, capturing_net_log.GetSize()); | 1079 EXPECT_EQ(3u, capturing_net_log.GetSize()); |
| 1063 | 1080 |
| 1064 // Check that identical redirects don't cause a conflict. | 1081 // Check that identical redirects don't cause a conflict. |
| 1065 linked_ptr<EventResponseDelta> d4( | 1082 linked_ptr<EventResponseDelta> d4( |
| 1066 new EventResponseDelta("extid4", base::Time::FromInternalValue(2000))); | 1083 new EventResponseDelta("extid4", base::Time::FromInternalValue(2000))); |
| 1067 d4->new_url = GURL(new_url_3); | 1084 d4->new_url = GURL(new_url_3); |
| 1068 deltas.push_back(d4); | 1085 deltas.push_back(d4); |
| 1069 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1086 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1070 conflicting_extensions.clear(); | |
| 1071 capturing_net_log.Clear(); | 1087 capturing_net_log.Clear(); |
| 1072 MergeOnBeforeRequestResponses( | 1088 MergeOnBeforeRequestResponses( |
| 1073 deltas, &effective_new_url, &conflicting_extensions, &net_log); | 1089 deltas, &effective_new_url, &warning_set, &net_log); |
| 1090 warnings = warning_set.Release(); |
| 1074 EXPECT_EQ(new_url_3, effective_new_url); | 1091 EXPECT_EQ(new_url_3, effective_new_url); |
| 1075 EXPECT_EQ(2u, conflicting_extensions.size()); | 1092 EXPECT_EQ(2u, warnings.size()); |
| 1076 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid1")); | 1093 EXPECT_TRUE(HasWarning(warnings, "extid1")); |
| 1077 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2")); | 1094 EXPECT_TRUE(HasWarning(warnings, "extid2")); |
| 1078 EXPECT_EQ(4u, capturing_net_log.GetSize()); | 1095 EXPECT_EQ(4u, capturing_net_log.GetSize()); |
| 1079 } | 1096 } |
| 1080 | 1097 |
| 1081 // This tests that we can redirect to data:// urls, which is considered | 1098 // This tests that we can redirect to data:// urls, which is considered |
| 1082 // a kind of cancelling requests. | 1099 // a kind of cancelling requests. |
| 1083 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses2) { | 1100 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses2) { |
| 1084 EventResponseDeltas deltas; | 1101 EventResponseDeltas deltas; |
| 1085 net::CapturingBoundNetLog capturing_net_log; | 1102 net::CapturingBoundNetLog capturing_net_log; |
| 1086 net::BoundNetLog net_log = capturing_net_log.bound(); | 1103 net::BoundNetLog net_log = capturing_net_log.bound(); |
| 1087 std::set<std::string> conflicting_extensions; | 1104 ExtensionWarningSet warning_set; |
| 1105 std::set<linked_ptr<ExtensionWarning> > warnings; |
| 1088 GURL effective_new_url; | 1106 GURL effective_new_url; |
| 1089 | 1107 |
| 1090 // Single redirect. | 1108 // Single redirect. |
| 1091 GURL new_url_0("http://foo.com"); | 1109 GURL new_url_0("http://foo.com"); |
| 1092 linked_ptr<EventResponseDelta> d0( | 1110 linked_ptr<EventResponseDelta> d0( |
| 1093 new EventResponseDelta("extid0", base::Time::FromInternalValue(2000))); | 1111 new EventResponseDelta("extid0", base::Time::FromInternalValue(2000))); |
| 1094 d0->new_url = GURL(new_url_0); | 1112 d0->new_url = GURL(new_url_0); |
| 1095 deltas.push_back(d0); | 1113 deltas.push_back(d0); |
| 1096 MergeOnBeforeRequestResponses( | 1114 MergeOnBeforeRequestResponses( |
| 1097 deltas, &effective_new_url, &conflicting_extensions, &net_log); | 1115 deltas, &effective_new_url, &warning_set, &net_log); |
| 1116 warnings = warning_set.Release(); |
| 1098 EXPECT_EQ(new_url_0, effective_new_url); | 1117 EXPECT_EQ(new_url_0, effective_new_url); |
| 1099 | 1118 |
| 1100 // Cancel request by redirecting to a data:// URL. This shall override | 1119 // Cancel request by redirecting to a data:// URL. This shall override |
| 1101 // the other redirect but not cause any conflict warnings. | 1120 // the other redirect but not cause any conflict warnings. |
| 1102 GURL new_url_1("data://foo"); | 1121 GURL new_url_1("data://foo"); |
| 1103 linked_ptr<EventResponseDelta> d1( | 1122 linked_ptr<EventResponseDelta> d1( |
| 1104 new EventResponseDelta("extid1", base::Time::FromInternalValue(1500))); | 1123 new EventResponseDelta("extid1", base::Time::FromInternalValue(1500))); |
| 1105 d1->new_url = GURL(new_url_1); | 1124 d1->new_url = GURL(new_url_1); |
| 1106 deltas.push_back(d1); | 1125 deltas.push_back(d1); |
| 1107 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1126 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1108 capturing_net_log.Clear(); | 1127 capturing_net_log.Clear(); |
| 1109 MergeOnBeforeRequestResponses( | 1128 MergeOnBeforeRequestResponses( |
| 1110 deltas, &effective_new_url, &conflicting_extensions, &net_log); | 1129 deltas, &effective_new_url, &warning_set, &net_log); |
| 1130 warnings = warning_set.Release(); |
| 1111 EXPECT_EQ(new_url_1, effective_new_url); | 1131 EXPECT_EQ(new_url_1, effective_new_url); |
| 1112 EXPECT_TRUE(conflicting_extensions.empty()); | 1132 EXPECT_TRUE(warnings.empty()); |
| 1113 EXPECT_EQ(1u, capturing_net_log.GetSize()); | 1133 EXPECT_EQ(1u, capturing_net_log.GetSize()); |
| 1114 | 1134 |
| 1115 // Cancel request by redirecting to the same data:// URL. This shall | 1135 // Cancel request by redirecting to the same data:// URL. This shall |
| 1116 // not create any conflicts as it is in line with d1. | 1136 // not create any conflicts as it is in line with d1. |
| 1117 GURL new_url_2("data://foo"); | 1137 GURL new_url_2("data://foo"); |
| 1118 linked_ptr<EventResponseDelta> d2( | 1138 linked_ptr<EventResponseDelta> d2( |
| 1119 new EventResponseDelta("extid2", base::Time::FromInternalValue(1000))); | 1139 new EventResponseDelta("extid2", base::Time::FromInternalValue(1000))); |
| 1120 d2->new_url = GURL(new_url_2); | 1140 d2->new_url = GURL(new_url_2); |
| 1121 deltas.push_back(d2); | 1141 deltas.push_back(d2); |
| 1122 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1142 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1123 capturing_net_log.Clear(); | 1143 capturing_net_log.Clear(); |
| 1124 MergeOnBeforeRequestResponses( | 1144 MergeOnBeforeRequestResponses( |
| 1125 deltas, &effective_new_url, &conflicting_extensions, &net_log); | 1145 deltas, &effective_new_url, &warning_set, &net_log); |
| 1146 warnings = warning_set.Release(); |
| 1126 EXPECT_EQ(new_url_1, effective_new_url); | 1147 EXPECT_EQ(new_url_1, effective_new_url); |
| 1127 EXPECT_TRUE(conflicting_extensions.empty()); | 1148 EXPECT_TRUE(warnings.empty()); |
| 1128 EXPECT_EQ(2u, capturing_net_log.GetSize()); | 1149 EXPECT_EQ(2u, capturing_net_log.GetSize()); |
| 1129 | 1150 |
| 1130 // Cancel redirect by redirecting to a different data:// URL. This needs | 1151 // Cancel redirect by redirecting to a different data:// URL. This needs |
| 1131 // to create a conflict. | 1152 // to create a conflict. |
| 1132 GURL new_url_3("data://something_totally_different"); | 1153 GURL new_url_3("data://something_totally_different"); |
| 1133 linked_ptr<EventResponseDelta> d3( | 1154 linked_ptr<EventResponseDelta> d3( |
| 1134 new EventResponseDelta("extid3", base::Time::FromInternalValue(500))); | 1155 new EventResponseDelta("extid3", base::Time::FromInternalValue(500))); |
| 1135 d3->new_url = GURL(new_url_3); | 1156 d3->new_url = GURL(new_url_3); |
| 1136 deltas.push_back(d3); | 1157 deltas.push_back(d3); |
| 1137 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1158 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1138 capturing_net_log.Clear(); | 1159 capturing_net_log.Clear(); |
| 1139 MergeOnBeforeRequestResponses( | 1160 MergeOnBeforeRequestResponses( |
| 1140 deltas, &effective_new_url, &conflicting_extensions, &net_log); | 1161 deltas, &effective_new_url, &warning_set, &net_log); |
| 1162 warnings = warning_set.Release(); |
| 1141 EXPECT_EQ(new_url_1, effective_new_url); | 1163 EXPECT_EQ(new_url_1, effective_new_url); |
| 1142 EXPECT_EQ(1u, conflicting_extensions.size()); | 1164 EXPECT_EQ(1u, warnings.size()); |
| 1143 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid3")); | 1165 EXPECT_TRUE(HasWarning(warnings, "extid3")); |
| 1144 EXPECT_EQ(3u, capturing_net_log.GetSize()); | 1166 EXPECT_EQ(3u, capturing_net_log.GetSize()); |
| 1145 } | 1167 } |
| 1146 | 1168 |
| 1147 // This tests that we can redirect to about:blank, which is considered | 1169 // This tests that we can redirect to about:blank, which is considered |
| 1148 // a kind of cancelling requests. | 1170 // a kind of cancelling requests. |
| 1149 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses3) { | 1171 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses3) { |
| 1150 EventResponseDeltas deltas; | 1172 EventResponseDeltas deltas; |
| 1151 net::CapturingBoundNetLog capturing_net_log; | 1173 net::CapturingBoundNetLog capturing_net_log; |
| 1152 net::BoundNetLog net_log = capturing_net_log.bound(); | 1174 net::BoundNetLog net_log = capturing_net_log.bound(); |
| 1153 std::set<std::string> conflicting_extensions; | 1175 ExtensionWarningSet warning_set; |
| 1176 std::set<linked_ptr<ExtensionWarning> > warnings; |
| 1154 GURL effective_new_url; | 1177 GURL effective_new_url; |
| 1155 | 1178 |
| 1156 // Single redirect. | 1179 // Single redirect. |
| 1157 GURL new_url_0("http://foo.com"); | 1180 GURL new_url_0("http://foo.com"); |
| 1158 linked_ptr<EventResponseDelta> d0( | 1181 linked_ptr<EventResponseDelta> d0( |
| 1159 new EventResponseDelta("extid0", base::Time::FromInternalValue(2000))); | 1182 new EventResponseDelta("extid0", base::Time::FromInternalValue(2000))); |
| 1160 d0->new_url = GURL(new_url_0); | 1183 d0->new_url = GURL(new_url_0); |
| 1161 deltas.push_back(d0); | 1184 deltas.push_back(d0); |
| 1162 MergeOnBeforeRequestResponses( | 1185 MergeOnBeforeRequestResponses( |
| 1163 deltas, &effective_new_url, &conflicting_extensions, &net_log); | 1186 deltas, &effective_new_url, &warning_set, &net_log); |
| 1187 warnings = warning_set.Release(); |
| 1164 EXPECT_EQ(new_url_0, effective_new_url); | 1188 EXPECT_EQ(new_url_0, effective_new_url); |
| 1165 | 1189 |
| 1166 // Cancel request by redirecting to about:blank. This shall override | 1190 // Cancel request by redirecting to about:blank. This shall override |
| 1167 // the other redirect but not cause any conflict warnings. | 1191 // the other redirect but not cause any conflict warnings. |
| 1168 GURL new_url_1("about:blank"); | 1192 GURL new_url_1("about:blank"); |
| 1169 linked_ptr<EventResponseDelta> d1( | 1193 linked_ptr<EventResponseDelta> d1( |
| 1170 new EventResponseDelta("extid1", base::Time::FromInternalValue(1500))); | 1194 new EventResponseDelta("extid1", base::Time::FromInternalValue(1500))); |
| 1171 d1->new_url = GURL(new_url_1); | 1195 d1->new_url = GURL(new_url_1); |
| 1172 deltas.push_back(d1); | 1196 deltas.push_back(d1); |
| 1173 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1197 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1174 capturing_net_log.Clear(); | 1198 capturing_net_log.Clear(); |
| 1175 MergeOnBeforeRequestResponses( | 1199 MergeOnBeforeRequestResponses( |
| 1176 deltas, &effective_new_url, &conflicting_extensions, &net_log); | 1200 deltas, &effective_new_url, &warning_set, &net_log); |
| 1201 warnings = warning_set.Release(); |
| 1177 EXPECT_EQ(new_url_1, effective_new_url); | 1202 EXPECT_EQ(new_url_1, effective_new_url); |
| 1178 EXPECT_TRUE(conflicting_extensions.empty()); | 1203 EXPECT_TRUE(warnings.empty()); |
| 1179 EXPECT_EQ(1u, capturing_net_log.GetSize()); | 1204 EXPECT_EQ(1u, capturing_net_log.GetSize()); |
| 1180 } | 1205 } |
| 1181 | 1206 |
| 1182 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeSendHeadersResponses) { | 1207 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeSendHeadersResponses) { |
| 1183 net::HttpRequestHeaders base_headers; | 1208 net::HttpRequestHeaders base_headers; |
| 1184 base_headers.AddHeaderFromString("key1: value 1"); | 1209 base_headers.AddHeaderFromString("key1: value 1"); |
| 1185 base_headers.AddHeaderFromString("key2: value 2"); | 1210 base_headers.AddHeaderFromString("key2: value 2"); |
| 1186 net::CapturingBoundNetLog capturing_net_log; | 1211 net::CapturingBoundNetLog capturing_net_log; |
| 1187 net::BoundNetLog net_log = capturing_net_log.bound(); | 1212 net::BoundNetLog net_log = capturing_net_log.bound(); |
| 1188 std::set<std::string> conflicting_extensions; | 1213 ExtensionWarningSet warning_set; |
| 1214 std::set<linked_ptr<ExtensionWarning> > warnings; |
| 1189 std::string header_value; | 1215 std::string header_value; |
| 1190 EventResponseDeltas deltas; | 1216 EventResponseDeltas deltas; |
| 1191 | 1217 |
| 1192 // Check that we can handle not changing the headers. | 1218 // Check that we can handle not changing the headers. |
| 1193 linked_ptr<EventResponseDelta> d0( | 1219 linked_ptr<EventResponseDelta> d0( |
| 1194 new EventResponseDelta("extid0", base::Time::FromInternalValue(2500))); | 1220 new EventResponseDelta("extid0", base::Time::FromInternalValue(2500))); |
| 1195 deltas.push_back(d0); | 1221 deltas.push_back(d0); |
| 1196 net::HttpRequestHeaders headers0; | 1222 net::HttpRequestHeaders headers0; |
| 1197 headers0.MergeFrom(base_headers); | 1223 headers0.MergeFrom(base_headers); |
| 1198 MergeOnBeforeSendHeadersResponses( | 1224 MergeOnBeforeSendHeadersResponses(deltas, &headers0, &warning_set, &net_log); |
| 1199 deltas, &headers0, &conflicting_extensions, &net_log); | 1225 warnings = warning_set.Release(); |
| 1200 ASSERT_TRUE(headers0.GetHeader("key1", &header_value)); | 1226 ASSERT_TRUE(headers0.GetHeader("key1", &header_value)); |
| 1201 EXPECT_EQ("value 1", header_value); | 1227 EXPECT_EQ("value 1", header_value); |
| 1202 ASSERT_TRUE(headers0.GetHeader("key2", &header_value)); | 1228 ASSERT_TRUE(headers0.GetHeader("key2", &header_value)); |
| 1203 EXPECT_EQ("value 2", header_value); | 1229 EXPECT_EQ("value 2", header_value); |
| 1204 EXPECT_EQ(0u, conflicting_extensions.size()); | 1230 EXPECT_EQ(0u, warnings.size()); |
| 1205 EXPECT_EQ(0u, capturing_net_log.GetSize()); | 1231 EXPECT_EQ(0u, capturing_net_log.GetSize()); |
| 1206 | 1232 |
| 1207 // Delete, modify and add a header. | 1233 // Delete, modify and add a header. |
| 1208 linked_ptr<EventResponseDelta> d1( | 1234 linked_ptr<EventResponseDelta> d1( |
| 1209 new EventResponseDelta("extid1", base::Time::FromInternalValue(2000))); | 1235 new EventResponseDelta("extid1", base::Time::FromInternalValue(2000))); |
| 1210 d1->deleted_request_headers.push_back("key1"); | 1236 d1->deleted_request_headers.push_back("key1"); |
| 1211 d1->modified_request_headers.AddHeaderFromString("key2: value 3"); | 1237 d1->modified_request_headers.AddHeaderFromString("key2: value 3"); |
| 1212 d1->modified_request_headers.AddHeaderFromString("key3: value 3"); | 1238 d1->modified_request_headers.AddHeaderFromString("key3: value 3"); |
| 1213 deltas.push_back(d1); | 1239 deltas.push_back(d1); |
| 1214 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1240 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1215 net::HttpRequestHeaders headers1; | 1241 net::HttpRequestHeaders headers1; |
| 1216 headers1.MergeFrom(base_headers); | 1242 headers1.MergeFrom(base_headers); |
| 1217 MergeOnBeforeSendHeadersResponses( | 1243 MergeOnBeforeSendHeadersResponses(deltas, &headers1, &warning_set, &net_log); |
| 1218 deltas, &headers1, &conflicting_extensions, &net_log); | 1244 warnings = warning_set.Release(); |
| 1219 EXPECT_FALSE(headers1.HasHeader("key1")); | 1245 EXPECT_FALSE(headers1.HasHeader("key1")); |
| 1220 ASSERT_TRUE(headers1.GetHeader("key2", &header_value)); | 1246 ASSERT_TRUE(headers1.GetHeader("key2", &header_value)); |
| 1221 EXPECT_EQ("value 3", header_value); | 1247 EXPECT_EQ("value 3", header_value); |
| 1222 ASSERT_TRUE(headers1.GetHeader("key3", &header_value)); | 1248 ASSERT_TRUE(headers1.GetHeader("key3", &header_value)); |
| 1223 EXPECT_EQ("value 3", header_value); | 1249 EXPECT_EQ("value 3", header_value); |
| 1224 EXPECT_EQ(0u, conflicting_extensions.size()); | 1250 EXPECT_EQ(0u, warnings.size()); |
| 1225 EXPECT_EQ(1u, capturing_net_log.GetSize()); | 1251 EXPECT_EQ(1u, capturing_net_log.GetSize()); |
| 1226 | 1252 |
| 1227 // Check that conflicts are atomic, i.e. if one header modification | 1253 // Check that conflicts are atomic, i.e. if one header modification |
| 1228 // collides all other conflicts of the same extension are declined as well. | 1254 // collides all other conflicts of the same extension are declined as well. |
| 1229 linked_ptr<EventResponseDelta> d2( | 1255 linked_ptr<EventResponseDelta> d2( |
| 1230 new EventResponseDelta("extid2", base::Time::FromInternalValue(1500))); | 1256 new EventResponseDelta("extid2", base::Time::FromInternalValue(1500))); |
| 1231 // This one conflicts: | 1257 // This one conflicts: |
| 1232 d2->modified_request_headers.AddHeaderFromString("key3: value 0"); | 1258 d2->modified_request_headers.AddHeaderFromString("key3: value 0"); |
| 1233 d2->modified_request_headers.AddHeaderFromString("key4: value 4"); | 1259 d2->modified_request_headers.AddHeaderFromString("key4: value 4"); |
| 1234 deltas.push_back(d2); | 1260 deltas.push_back(d2); |
| 1235 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1261 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1236 conflicting_extensions.clear(); | |
| 1237 capturing_net_log.Clear(); | 1262 capturing_net_log.Clear(); |
| 1238 net::HttpRequestHeaders headers2; | 1263 net::HttpRequestHeaders headers2; |
| 1239 headers2.MergeFrom(base_headers); | 1264 headers2.MergeFrom(base_headers); |
| 1240 MergeOnBeforeSendHeadersResponses( | 1265 MergeOnBeforeSendHeadersResponses(deltas, &headers2, &warning_set, &net_log); |
| 1241 deltas, &headers2, &conflicting_extensions, &net_log); | 1266 warnings = warning_set.Release(); |
| 1242 EXPECT_FALSE(headers2.HasHeader("key1")); | 1267 EXPECT_FALSE(headers2.HasHeader("key1")); |
| 1243 ASSERT_TRUE(headers2.GetHeader("key2", &header_value)); | 1268 ASSERT_TRUE(headers2.GetHeader("key2", &header_value)); |
| 1244 EXPECT_EQ("value 3", header_value); | 1269 EXPECT_EQ("value 3", header_value); |
| 1245 ASSERT_TRUE(headers2.GetHeader("key3", &header_value)); | 1270 ASSERT_TRUE(headers2.GetHeader("key3", &header_value)); |
| 1246 EXPECT_EQ("value 3", header_value); | 1271 EXPECT_EQ("value 3", header_value); |
| 1247 EXPECT_FALSE(headers2.HasHeader("key4")); | 1272 EXPECT_FALSE(headers2.HasHeader("key4")); |
| 1248 EXPECT_EQ(1u, conflicting_extensions.size()); | 1273 EXPECT_EQ(1u, warnings.size()); |
| 1249 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2")); | 1274 EXPECT_TRUE(HasWarning(warnings, "extid2")); |
| 1250 EXPECT_EQ(2u, capturing_net_log.GetSize()); | 1275 EXPECT_EQ(2u, capturing_net_log.GetSize()); |
| 1251 | 1276 |
| 1252 // Check that identical modifications don't conflict and operations | 1277 // Check that identical modifications don't conflict and operations |
| 1253 // can be merged. | 1278 // can be merged. |
| 1254 linked_ptr<EventResponseDelta> d3( | 1279 linked_ptr<EventResponseDelta> d3( |
| 1255 new EventResponseDelta("extid3", base::Time::FromInternalValue(1000))); | 1280 new EventResponseDelta("extid3", base::Time::FromInternalValue(1000))); |
| 1256 d3->deleted_request_headers.push_back("key1"); | 1281 d3->deleted_request_headers.push_back("key1"); |
| 1257 d3->modified_request_headers.AddHeaderFromString("key2: value 3"); | 1282 d3->modified_request_headers.AddHeaderFromString("key2: value 3"); |
| 1258 d3->modified_request_headers.AddHeaderFromString("key5: value 5"); | 1283 d3->modified_request_headers.AddHeaderFromString("key5: value 5"); |
| 1259 deltas.push_back(d3); | 1284 deltas.push_back(d3); |
| 1260 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1285 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1261 conflicting_extensions.clear(); | |
| 1262 capturing_net_log.Clear(); | 1286 capturing_net_log.Clear(); |
| 1263 net::HttpRequestHeaders headers3; | 1287 net::HttpRequestHeaders headers3; |
| 1264 headers3.MergeFrom(base_headers); | 1288 headers3.MergeFrom(base_headers); |
| 1265 MergeOnBeforeSendHeadersResponses( | 1289 MergeOnBeforeSendHeadersResponses(deltas, &headers3, &warning_set, &net_log); |
| 1266 deltas, &headers3, &conflicting_extensions, &net_log); | 1290 warnings = warning_set.Release(); |
| 1267 EXPECT_FALSE(headers3.HasHeader("key1")); | 1291 EXPECT_FALSE(headers3.HasHeader("key1")); |
| 1268 ASSERT_TRUE(headers3.GetHeader("key2", &header_value)); | 1292 ASSERT_TRUE(headers3.GetHeader("key2", &header_value)); |
| 1269 EXPECT_EQ("value 3", header_value); | 1293 EXPECT_EQ("value 3", header_value); |
| 1270 ASSERT_TRUE(headers3.GetHeader("key3", &header_value)); | 1294 ASSERT_TRUE(headers3.GetHeader("key3", &header_value)); |
| 1271 EXPECT_EQ("value 3", header_value); | 1295 EXPECT_EQ("value 3", header_value); |
| 1272 ASSERT_TRUE(headers3.GetHeader("key5", &header_value)); | 1296 ASSERT_TRUE(headers3.GetHeader("key5", &header_value)); |
| 1273 EXPECT_EQ("value 5", header_value); | 1297 EXPECT_EQ("value 5", header_value); |
| 1274 EXPECT_EQ(1u, conflicting_extensions.size()); | 1298 EXPECT_EQ(1u, warnings.size()); |
| 1275 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2")); | 1299 EXPECT_TRUE(HasWarning(warnings, "extid2")); |
| 1276 EXPECT_EQ(3u, capturing_net_log.GetSize()); | 1300 EXPECT_EQ(3u, capturing_net_log.GetSize()); |
| 1277 } | 1301 } |
| 1278 | 1302 |
| 1279 TEST(ExtensionWebRequestHelpersTest, | 1303 TEST(ExtensionWebRequestHelpersTest, |
| 1280 TestMergeOnBeforeSendHeadersResponses_Cookies) { | 1304 TestMergeOnBeforeSendHeadersResponses_Cookies) { |
| 1281 net::HttpRequestHeaders base_headers; | 1305 net::HttpRequestHeaders base_headers; |
| 1282 base_headers.AddHeaderFromString( | 1306 base_headers.AddHeaderFromString( |
| 1283 "Cookie: name=value; name2=value2; name3=value3"); | 1307 "Cookie: name=value; name2=value2; name3=value3"); |
| 1284 net::CapturingBoundNetLog capturing_net_log; | 1308 net::CapturingBoundNetLog capturing_net_log; |
| 1285 net::BoundNetLog net_log = capturing_net_log.bound(); | 1309 net::BoundNetLog net_log = capturing_net_log.bound(); |
| 1286 std::set<std::string> conflicting_extensions; | 1310 ExtensionWarningSet warning_set; |
| 1311 std::set<linked_ptr<ExtensionWarning> > warnings; |
| 1287 std::string header_value; | 1312 std::string header_value; |
| 1288 EventResponseDeltas deltas; | 1313 EventResponseDeltas deltas; |
| 1289 | 1314 |
| 1290 linked_ptr<RequestCookieModification> add_cookie = | 1315 linked_ptr<RequestCookieModification> add_cookie = |
| 1291 make_linked_ptr(new RequestCookieModification); | 1316 make_linked_ptr(new RequestCookieModification); |
| 1292 add_cookie->type = helpers::ADD; | 1317 add_cookie->type = helpers::ADD; |
| 1293 add_cookie->modification.reset(new helpers::RequestCookie); | 1318 add_cookie->modification.reset(new helpers::RequestCookie); |
| 1294 add_cookie->modification->name.reset(new std::string("name4")); | 1319 add_cookie->modification->name.reset(new std::string("name4")); |
| 1295 add_cookie->modification->value.reset(new std::string("\"value 4\"")); | 1320 add_cookie->modification->value.reset(new std::string("\"value 4\"")); |
| 1296 | 1321 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 1321 | 1346 |
| 1322 for (size_t i = 0; i < arraysize(operations); ++i) { | 1347 for (size_t i = 0; i < arraysize(operations); ++i) { |
| 1323 linked_ptr<EventResponseDelta> delta( | 1348 linked_ptr<EventResponseDelta> delta( |
| 1324 new EventResponseDelta("extid0", base::Time::FromInternalValue(i * 5))); | 1349 new EventResponseDelta("extid0", base::Time::FromInternalValue(i * 5))); |
| 1325 delta->request_cookie_modifications.push_back(operations[i]); | 1350 delta->request_cookie_modifications.push_back(operations[i]); |
| 1326 deltas.push_back(delta); | 1351 deltas.push_back(delta); |
| 1327 } | 1352 } |
| 1328 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1353 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1329 net::HttpRequestHeaders headers1; | 1354 net::HttpRequestHeaders headers1; |
| 1330 headers1.MergeFrom(base_headers); | 1355 headers1.MergeFrom(base_headers); |
| 1331 MergeOnBeforeSendHeadersResponses( | 1356 MergeOnBeforeSendHeadersResponses(deltas, &headers1, &warning_set, &net_log); |
| 1332 deltas, &headers1, &conflicting_extensions, &net_log); | 1357 warnings = warning_set.Release(); |
| 1333 EXPECT_TRUE(headers1.HasHeader("Cookie")); | 1358 EXPECT_TRUE(headers1.HasHeader("Cookie")); |
| 1334 ASSERT_TRUE(headers1.GetHeader("Cookie", &header_value)); | 1359 ASSERT_TRUE(headers1.GetHeader("Cookie", &header_value)); |
| 1335 EXPECT_EQ("name=new value; name2=new value; name4=\"value 4\"", header_value); | 1360 EXPECT_EQ("name=new value; name2=new value; name4=\"value 4\"", header_value); |
| 1336 EXPECT_EQ(0u, conflicting_extensions.size()); | 1361 EXPECT_EQ(0u, warnings.size()); |
| 1337 EXPECT_EQ(0u, capturing_net_log.GetSize()); | 1362 EXPECT_EQ(0u, capturing_net_log.GetSize()); |
| 1338 } | 1363 } |
| 1339 | 1364 |
| 1340 TEST(ExtensionWebRequestHelpersTest, | 1365 TEST(ExtensionWebRequestHelpersTest, |
| 1341 TestMergeCookiesInOnHeadersReceivedResponses) { | 1366 TestMergeCookiesInOnHeadersReceivedResponses) { |
| 1342 net::CapturingBoundNetLog capturing_net_log; | 1367 net::CapturingBoundNetLog capturing_net_log; |
| 1343 net::BoundNetLog net_log = capturing_net_log.bound(); | 1368 net::BoundNetLog net_log = capturing_net_log.bound(); |
| 1344 std::set<std::string> conflicting_extensions; | 1369 ExtensionWarningSet warning_set; |
| 1370 std::set<linked_ptr<ExtensionWarning> > warnings; |
| 1345 std::string header_value; | 1371 std::string header_value; |
| 1346 EventResponseDeltas deltas; | 1372 EventResponseDeltas deltas; |
| 1347 | 1373 |
| 1348 char base_headers_string[] = | 1374 char base_headers_string[] = |
| 1349 "HTTP/1.0 200 OK\r\n" | 1375 "HTTP/1.0 200 OK\r\n" |
| 1350 "Foo: Bar\r\n" | 1376 "Foo: Bar\r\n" |
| 1351 "Set-Cookie: name=value; DOMAIN=google.com; Secure\r\n" | 1377 "Set-Cookie: name=value; DOMAIN=google.com; Secure\r\n" |
| 1352 "Set-Cookie: name2=value2\r\n" | 1378 "Set-Cookie: name2=value2\r\n" |
| 1353 "Set-Cookie: name3=value3\r\n" | 1379 "Set-Cookie: name3=value3\r\n" |
| 1354 "\r\n"; | 1380 "\r\n"; |
| 1355 scoped_refptr<net::HttpResponseHeaders> base_headers( | 1381 scoped_refptr<net::HttpResponseHeaders> base_headers( |
| 1356 new net::HttpResponseHeaders( | 1382 new net::HttpResponseHeaders( |
| 1357 net::HttpUtil::AssembleRawHeaders( | 1383 net::HttpUtil::AssembleRawHeaders( |
| 1358 base_headers_string, sizeof(base_headers_string)))); | 1384 base_headers_string, sizeof(base_headers_string)))); |
| 1359 | 1385 |
| 1360 // Check that we can handle if not touching the response headers. | 1386 // Check that we can handle if not touching the response headers. |
| 1361 linked_ptr<EventResponseDelta> d0( | 1387 linked_ptr<EventResponseDelta> d0( |
| 1362 new EventResponseDelta("extid0", base::Time::FromInternalValue(3000))); | 1388 new EventResponseDelta("extid0", base::Time::FromInternalValue(3000))); |
| 1363 deltas.push_back(d0); | 1389 deltas.push_back(d0); |
| 1364 scoped_refptr<net::HttpResponseHeaders> new_headers0; | 1390 scoped_refptr<net::HttpResponseHeaders> new_headers0; |
| 1365 MergeCookiesInOnHeadersReceivedResponses( | 1391 MergeCookiesInOnHeadersReceivedResponses( |
| 1366 deltas, base_headers.get(), &new_headers0, &conflicting_extensions, | 1392 deltas, base_headers.get(), &new_headers0, &warning_set, &net_log); |
| 1367 &net_log); | 1393 warnings = warning_set.Release(); |
| 1368 EXPECT_FALSE(new_headers0.get()); | 1394 EXPECT_FALSE(new_headers0.get()); |
| 1369 EXPECT_EQ(0u, conflicting_extensions.size()); | 1395 EXPECT_EQ(0u, warnings.size()); |
| 1370 EXPECT_EQ(0u, capturing_net_log.GetSize()); | 1396 EXPECT_EQ(0u, capturing_net_log.GetSize()); |
| 1371 | 1397 |
| 1372 linked_ptr<ResponseCookieModification> add_cookie = | 1398 linked_ptr<ResponseCookieModification> add_cookie = |
| 1373 make_linked_ptr(new ResponseCookieModification); | 1399 make_linked_ptr(new ResponseCookieModification); |
| 1374 add_cookie->type = helpers::ADD; | 1400 add_cookie->type = helpers::ADD; |
| 1375 add_cookie->modification.reset(new helpers::ResponseCookie); | 1401 add_cookie->modification.reset(new helpers::ResponseCookie); |
| 1376 add_cookie->modification->name.reset(new std::string("name4")); | 1402 add_cookie->modification->name.reset(new std::string("name4")); |
| 1377 add_cookie->modification->value.reset(new std::string("\"value4\"")); | 1403 add_cookie->modification->value.reset(new std::string("\"value4\"")); |
| 1378 | 1404 |
| 1379 linked_ptr<ResponseCookieModification> edit_cookie = | 1405 linked_ptr<ResponseCookieModification> edit_cookie = |
| (...skipping 28 matching lines...) Expand all Loading... |
| 1408 delta->response_cookie_modifications.push_back(operations[i]); | 1434 delta->response_cookie_modifications.push_back(operations[i]); |
| 1409 deltas.push_back(delta); | 1435 deltas.push_back(delta); |
| 1410 } | 1436 } |
| 1411 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1437 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1412 scoped_refptr<net::HttpResponseHeaders> headers1( | 1438 scoped_refptr<net::HttpResponseHeaders> headers1( |
| 1413 new net::HttpResponseHeaders( | 1439 new net::HttpResponseHeaders( |
| 1414 net::HttpUtil::AssembleRawHeaders( | 1440 net::HttpUtil::AssembleRawHeaders( |
| 1415 base_headers_string, sizeof(base_headers_string)))); | 1441 base_headers_string, sizeof(base_headers_string)))); |
| 1416 scoped_refptr<net::HttpResponseHeaders> new_headers1; | 1442 scoped_refptr<net::HttpResponseHeaders> new_headers1; |
| 1417 MergeCookiesInOnHeadersReceivedResponses( | 1443 MergeCookiesInOnHeadersReceivedResponses( |
| 1418 deltas, headers1.get(), &new_headers1, &conflicting_extensions, &net_log); | 1444 deltas, headers1.get(), &new_headers1, &warning_set, &net_log); |
| 1445 warnings = warning_set.Release(); |
| 1419 | 1446 |
| 1420 EXPECT_TRUE(new_headers1->HasHeader("Foo")); | 1447 EXPECT_TRUE(new_headers1->HasHeader("Foo")); |
| 1421 void* iter = NULL; | 1448 void* iter = NULL; |
| 1422 std::string cookie_string; | 1449 std::string cookie_string; |
| 1423 std::set<std::string> expected_cookies; | 1450 std::set<std::string> expected_cookies; |
| 1424 expected_cookies.insert("name=value; domain=google.com; secure"); | 1451 expected_cookies.insert("name=value; domain=google.com; secure"); |
| 1425 expected_cookies.insert("name2=value2; secure"); | 1452 expected_cookies.insert("name2=value2; secure"); |
| 1426 expected_cookies.insert("name4=\"value4\"; secure"); | 1453 expected_cookies.insert("name4=\"value4\"; secure"); |
| 1427 std::set<std::string> actual_cookies; | 1454 std::set<std::string> actual_cookies; |
| 1428 while (new_headers1->EnumerateHeader(&iter, "Set-Cookie", &cookie_string)) | 1455 while (new_headers1->EnumerateHeader(&iter, "Set-Cookie", &cookie_string)) |
| 1429 actual_cookies.insert(cookie_string); | 1456 actual_cookies.insert(cookie_string); |
| 1430 EXPECT_EQ(expected_cookies, actual_cookies); | 1457 EXPECT_EQ(expected_cookies, actual_cookies); |
| 1431 EXPECT_EQ(0u, conflicting_extensions.size()); | 1458 EXPECT_EQ(0u, warnings.size()); |
| 1432 EXPECT_EQ(0u, capturing_net_log.GetSize()); | 1459 EXPECT_EQ(0u, capturing_net_log.GetSize()); |
| 1433 } | 1460 } |
| 1434 | 1461 |
| 1435 TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponses) { | 1462 TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponses) { |
| 1436 net::CapturingBoundNetLog capturing_net_log; | 1463 net::CapturingBoundNetLog capturing_net_log; |
| 1437 net::BoundNetLog net_log = capturing_net_log.bound(); | 1464 net::BoundNetLog net_log = capturing_net_log.bound(); |
| 1438 std::set<std::string> conflicting_extensions; | 1465 ExtensionWarningSet warning_set; |
| 1466 std::set<linked_ptr<ExtensionWarning> > warnings; |
| 1439 std::string header_value; | 1467 std::string header_value; |
| 1440 EventResponseDeltas deltas; | 1468 EventResponseDeltas deltas; |
| 1441 | 1469 |
| 1442 char base_headers_string[] = | 1470 char base_headers_string[] = |
| 1443 "HTTP/1.0 200 OK\r\n" | 1471 "HTTP/1.0 200 OK\r\n" |
| 1444 "Key1: Value1\r\n" | 1472 "Key1: Value1\r\n" |
| 1445 "Key2: Value2, Foo\r\n" | 1473 "Key2: Value2, Foo\r\n" |
| 1446 "\r\n"; | 1474 "\r\n"; |
| 1447 scoped_refptr<net::HttpResponseHeaders> base_headers( | 1475 scoped_refptr<net::HttpResponseHeaders> base_headers( |
| 1448 new net::HttpResponseHeaders( | 1476 new net::HttpResponseHeaders( |
| 1449 net::HttpUtil::AssembleRawHeaders( | 1477 net::HttpUtil::AssembleRawHeaders( |
| 1450 base_headers_string, sizeof(base_headers_string)))); | 1478 base_headers_string, sizeof(base_headers_string)))); |
| 1451 | 1479 |
| 1452 // Check that we can handle if not touching the response headers. | 1480 // Check that we can handle if not touching the response headers. |
| 1453 linked_ptr<EventResponseDelta> d0( | 1481 linked_ptr<EventResponseDelta> d0( |
| 1454 new EventResponseDelta("extid0", base::Time::FromInternalValue(3000))); | 1482 new EventResponseDelta("extid0", base::Time::FromInternalValue(3000))); |
| 1455 deltas.push_back(d0); | 1483 deltas.push_back(d0); |
| 1456 scoped_refptr<net::HttpResponseHeaders> new_headers0; | 1484 scoped_refptr<net::HttpResponseHeaders> new_headers0; |
| 1457 MergeOnHeadersReceivedResponses( | 1485 MergeOnHeadersReceivedResponses(deltas, base_headers.get(), &new_headers0, |
| 1458 deltas, base_headers.get(), &new_headers0, &conflicting_extensions, | 1486 &warning_set, &net_log); |
| 1459 &net_log); | 1487 warnings = warning_set.Release(); |
| 1460 EXPECT_FALSE(new_headers0.get()); | 1488 EXPECT_FALSE(new_headers0.get()); |
| 1461 EXPECT_EQ(0u, conflicting_extensions.size()); | 1489 EXPECT_EQ(0u, warnings.size()); |
| 1462 EXPECT_EQ(0u, capturing_net_log.GetSize()); | 1490 EXPECT_EQ(0u, capturing_net_log.GetSize()); |
| 1463 | 1491 |
| 1464 linked_ptr<EventResponseDelta> d1( | 1492 linked_ptr<EventResponseDelta> d1( |
| 1465 new EventResponseDelta("extid1", base::Time::FromInternalValue(2000))); | 1493 new EventResponseDelta("extid1", base::Time::FromInternalValue(2000))); |
| 1466 d1->deleted_response_headers.push_back(ResponseHeader("KEY1", "Value1")); | 1494 d1->deleted_response_headers.push_back(ResponseHeader("KEY1", "Value1")); |
| 1467 d1->deleted_response_headers.push_back(ResponseHeader("KEY2", "Value2, Foo")); | 1495 d1->deleted_response_headers.push_back(ResponseHeader("KEY2", "Value2, Foo")); |
| 1468 d1->added_response_headers.push_back(ResponseHeader("Key2", "Value3")); | 1496 d1->added_response_headers.push_back(ResponseHeader("Key2", "Value3")); |
| 1469 deltas.push_back(d1); | 1497 deltas.push_back(d1); |
| 1470 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1498 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1471 conflicting_extensions.clear(); | |
| 1472 capturing_net_log.Clear(); | 1499 capturing_net_log.Clear(); |
| 1473 scoped_refptr<net::HttpResponseHeaders> new_headers1; | 1500 scoped_refptr<net::HttpResponseHeaders> new_headers1; |
| 1474 MergeOnHeadersReceivedResponses( | 1501 MergeOnHeadersReceivedResponses( |
| 1475 deltas, base_headers.get(), &new_headers1, &conflicting_extensions, | 1502 deltas, base_headers.get(), &new_headers1, &warning_set, &net_log); |
| 1476 &net_log); | 1503 warnings = warning_set.Release(); |
| 1477 ASSERT_TRUE(new_headers1.get()); | 1504 ASSERT_TRUE(new_headers1.get()); |
| 1478 std::multimap<std::string, std::string> expected1; | 1505 std::multimap<std::string, std::string> expected1; |
| 1479 expected1.insert(std::pair<std::string, std::string>("Key2", "Value3")); | 1506 expected1.insert(std::pair<std::string, std::string>("Key2", "Value3")); |
| 1480 void* iter = NULL; | 1507 void* iter = NULL; |
| 1481 std::string name; | 1508 std::string name; |
| 1482 std::string value; | 1509 std::string value; |
| 1483 std::multimap<std::string, std::string> actual1; | 1510 std::multimap<std::string, std::string> actual1; |
| 1484 while (new_headers1->EnumerateHeaderLines(&iter, &name, &value)) { | 1511 while (new_headers1->EnumerateHeaderLines(&iter, &name, &value)) { |
| 1485 actual1.insert(std::pair<std::string, std::string>(name, value)); | 1512 actual1.insert(std::pair<std::string, std::string>(name, value)); |
| 1486 } | 1513 } |
| 1487 EXPECT_EQ(expected1, actual1); | 1514 EXPECT_EQ(expected1, actual1); |
| 1488 EXPECT_EQ(0u, conflicting_extensions.size()); | 1515 EXPECT_EQ(0u, warnings.size()); |
| 1489 EXPECT_EQ(1u, capturing_net_log.GetSize()); | 1516 EXPECT_EQ(1u, capturing_net_log.GetSize()); |
| 1490 | 1517 |
| 1491 // Check that we replace response headers only once. | 1518 // Check that we replace response headers only once. |
| 1492 linked_ptr<EventResponseDelta> d2( | 1519 linked_ptr<EventResponseDelta> d2( |
| 1493 new EventResponseDelta("extid2", base::Time::FromInternalValue(1500))); | 1520 new EventResponseDelta("extid2", base::Time::FromInternalValue(1500))); |
| 1494 // Note that we use a different capitalization of KeY2. This should not | 1521 // Note that we use a different capitalization of KeY2. This should not |
| 1495 // matter. | 1522 // matter. |
| 1496 d2->deleted_response_headers.push_back(ResponseHeader("KeY2", "Value2, Foo")); | 1523 d2->deleted_response_headers.push_back(ResponseHeader("KeY2", "Value2, Foo")); |
| 1497 d2->added_response_headers.push_back(ResponseHeader("Key2", "Value4")); | 1524 d2->added_response_headers.push_back(ResponseHeader("Key2", "Value4")); |
| 1498 deltas.push_back(d2); | 1525 deltas.push_back(d2); |
| 1499 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1526 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1500 conflicting_extensions.clear(); | |
| 1501 capturing_net_log.Clear(); | 1527 capturing_net_log.Clear(); |
| 1502 scoped_refptr<net::HttpResponseHeaders> new_headers2; | 1528 scoped_refptr<net::HttpResponseHeaders> new_headers2; |
| 1503 MergeOnHeadersReceivedResponses( | 1529 MergeOnHeadersReceivedResponses( |
| 1504 deltas, base_headers.get(), &new_headers2, &conflicting_extensions, | 1530 deltas, base_headers.get(), &new_headers2, &warning_set, &net_log); |
| 1505 &net_log); | 1531 warnings = warning_set.Release(); |
| 1506 ASSERT_TRUE(new_headers2.get()); | 1532 ASSERT_TRUE(new_headers2.get()); |
| 1507 iter = NULL; | 1533 iter = NULL; |
| 1508 std::multimap<std::string, std::string> actual2; | 1534 std::multimap<std::string, std::string> actual2; |
| 1509 while (new_headers2->EnumerateHeaderLines(&iter, &name, &value)) { | 1535 while (new_headers2->EnumerateHeaderLines(&iter, &name, &value)) { |
| 1510 actual2.insert(std::pair<std::string, std::string>(name, value)); | 1536 actual2.insert(std::pair<std::string, std::string>(name, value)); |
| 1511 } | 1537 } |
| 1512 EXPECT_EQ(expected1, actual2); | 1538 EXPECT_EQ(expected1, actual2); |
| 1513 EXPECT_EQ(1u, conflicting_extensions.size()); | 1539 EXPECT_EQ(1u, warnings.size()); |
| 1514 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2")); | 1540 EXPECT_TRUE(HasWarning(warnings, "extid2")); |
| 1515 EXPECT_EQ(2u, capturing_net_log.GetSize()); | 1541 EXPECT_EQ(2u, capturing_net_log.GetSize()); |
| 1516 } | 1542 } |
| 1517 | 1543 |
| 1518 // Check that we do not delete too much | 1544 // Check that we do not delete too much |
| 1519 TEST(ExtensionWebRequestHelpersTest, | 1545 TEST(ExtensionWebRequestHelpersTest, |
| 1520 TestMergeOnHeadersReceivedResponsesDeletion) { | 1546 TestMergeOnHeadersReceivedResponsesDeletion) { |
| 1521 net::CapturingBoundNetLog capturing_net_log; | 1547 net::CapturingBoundNetLog capturing_net_log; |
| 1522 net::BoundNetLog net_log = capturing_net_log.bound(); | 1548 net::BoundNetLog net_log = capturing_net_log.bound(); |
| 1523 std::set<std::string> conflicting_extensions; | 1549 ExtensionWarningSet warning_set; |
| 1550 std::set<linked_ptr<ExtensionWarning> > warnings; |
| 1524 std::string header_value; | 1551 std::string header_value; |
| 1525 EventResponseDeltas deltas; | 1552 EventResponseDeltas deltas; |
| 1526 | 1553 |
| 1527 char base_headers_string[] = | 1554 char base_headers_string[] = |
| 1528 "HTTP/1.0 200 OK\r\n" | 1555 "HTTP/1.0 200 OK\r\n" |
| 1529 "Key1: Value1\r\n" | 1556 "Key1: Value1\r\n" |
| 1530 "Key1: Value2\r\n" | 1557 "Key1: Value2\r\n" |
| 1531 "Key1: Value3\r\n" | 1558 "Key1: Value3\r\n" |
| 1532 "Key2: Value4\r\n" | 1559 "Key2: Value4\r\n" |
| 1533 "\r\n"; | 1560 "\r\n"; |
| 1534 scoped_refptr<net::HttpResponseHeaders> base_headers( | 1561 scoped_refptr<net::HttpResponseHeaders> base_headers( |
| 1535 new net::HttpResponseHeaders( | 1562 new net::HttpResponseHeaders( |
| 1536 net::HttpUtil::AssembleRawHeaders( | 1563 net::HttpUtil::AssembleRawHeaders( |
| 1537 base_headers_string, sizeof(base_headers_string)))); | 1564 base_headers_string, sizeof(base_headers_string)))); |
| 1538 | 1565 |
| 1539 linked_ptr<EventResponseDelta> d1( | 1566 linked_ptr<EventResponseDelta> d1( |
| 1540 new EventResponseDelta("extid1", base::Time::FromInternalValue(2000))); | 1567 new EventResponseDelta("extid1", base::Time::FromInternalValue(2000))); |
| 1541 d1->deleted_response_headers.push_back(ResponseHeader("KEY1", "Value2")); | 1568 d1->deleted_response_headers.push_back(ResponseHeader("KEY1", "Value2")); |
| 1542 deltas.push_back(d1); | 1569 deltas.push_back(d1); |
| 1543 scoped_refptr<net::HttpResponseHeaders> new_headers1; | 1570 scoped_refptr<net::HttpResponseHeaders> new_headers1; |
| 1544 MergeOnHeadersReceivedResponses( | 1571 MergeOnHeadersReceivedResponses( |
| 1545 deltas, base_headers.get(), &new_headers1, &conflicting_extensions, | 1572 deltas, base_headers.get(), &new_headers1, &warning_set, &net_log); |
| 1546 &net_log); | 1573 warnings = warning_set.Release(); |
| 1547 ASSERT_TRUE(new_headers1.get()); | 1574 ASSERT_TRUE(new_headers1.get()); |
| 1548 std::multimap<std::string, std::string> expected1; | 1575 std::multimap<std::string, std::string> expected1; |
| 1549 expected1.insert(std::pair<std::string, std::string>("Key1", "Value1")); | 1576 expected1.insert(std::pair<std::string, std::string>("Key1", "Value1")); |
| 1550 expected1.insert(std::pair<std::string, std::string>("Key1", "Value3")); | 1577 expected1.insert(std::pair<std::string, std::string>("Key1", "Value3")); |
| 1551 expected1.insert(std::pair<std::string, std::string>("Key2", "Value4")); | 1578 expected1.insert(std::pair<std::string, std::string>("Key2", "Value4")); |
| 1552 void* iter = NULL; | 1579 void* iter = NULL; |
| 1553 std::string name; | 1580 std::string name; |
| 1554 std::string value; | 1581 std::string value; |
| 1555 std::multimap<std::string, std::string> actual1; | 1582 std::multimap<std::string, std::string> actual1; |
| 1556 while (new_headers1->EnumerateHeaderLines(&iter, &name, &value)) { | 1583 while (new_headers1->EnumerateHeaderLines(&iter, &name, &value)) { |
| 1557 actual1.insert(std::pair<std::string, std::string>(name, value)); | 1584 actual1.insert(std::pair<std::string, std::string>(name, value)); |
| 1558 } | 1585 } |
| 1559 EXPECT_EQ(expected1, actual1); | 1586 EXPECT_EQ(expected1, actual1); |
| 1560 EXPECT_EQ(0u, conflicting_extensions.size()); | 1587 EXPECT_EQ(0u, warnings.size()); |
| 1561 EXPECT_EQ(1u, capturing_net_log.GetSize()); | 1588 EXPECT_EQ(1u, capturing_net_log.GetSize()); |
| 1562 } | 1589 } |
| 1563 | 1590 |
| 1564 TEST(ExtensionWebRequestHelpersTest, TestMergeOnAuthRequiredResponses) { | 1591 TEST(ExtensionWebRequestHelpersTest, TestMergeOnAuthRequiredResponses) { |
| 1565 net::CapturingBoundNetLog capturing_net_log; | 1592 net::CapturingBoundNetLog capturing_net_log; |
| 1566 net::BoundNetLog net_log = capturing_net_log.bound(); | 1593 net::BoundNetLog net_log = capturing_net_log.bound(); |
| 1567 std::set<std::string> conflicting_extensions; | 1594 ExtensionWarningSet warning_set; |
| 1595 std::set<linked_ptr<ExtensionWarning> > warnings; |
| 1568 EventResponseDeltas deltas; | 1596 EventResponseDeltas deltas; |
| 1569 string16 username = ASCIIToUTF16("foo"); | 1597 string16 username = ASCIIToUTF16("foo"); |
| 1570 string16 password = ASCIIToUTF16("bar"); | 1598 string16 password = ASCIIToUTF16("bar"); |
| 1571 string16 password2 = ASCIIToUTF16("baz"); | 1599 string16 password2 = ASCIIToUTF16("baz"); |
| 1572 | 1600 |
| 1573 // Check that we can handle if not returning credentials. | 1601 // Check that we can handle if not returning credentials. |
| 1574 linked_ptr<EventResponseDelta> d0( | 1602 linked_ptr<EventResponseDelta> d0( |
| 1575 new EventResponseDelta("extid0", base::Time::FromInternalValue(3000))); | 1603 new EventResponseDelta("extid0", base::Time::FromInternalValue(3000))); |
| 1576 deltas.push_back(d0); | 1604 deltas.push_back(d0); |
| 1577 net::AuthCredentials auth0; | 1605 net::AuthCredentials auth0; |
| 1578 bool credentials_set = MergeOnAuthRequiredResponses( | 1606 bool credentials_set = MergeOnAuthRequiredResponses( |
| 1579 deltas, &auth0, &conflicting_extensions, &net_log); | 1607 deltas, &auth0, &warning_set, &net_log); |
| 1608 warnings = warning_set.Release(); |
| 1580 EXPECT_FALSE(credentials_set); | 1609 EXPECT_FALSE(credentials_set); |
| 1581 EXPECT_TRUE(auth0.Empty()); | 1610 EXPECT_TRUE(auth0.Empty()); |
| 1582 EXPECT_EQ(0u, conflicting_extensions.size()); | 1611 EXPECT_EQ(0u, warnings.size()); |
| 1583 EXPECT_EQ(0u, capturing_net_log.GetSize()); | 1612 EXPECT_EQ(0u, capturing_net_log.GetSize()); |
| 1584 | 1613 |
| 1585 // Check that we can set AuthCredentials. | 1614 // Check that we can set AuthCredentials. |
| 1586 linked_ptr<EventResponseDelta> d1( | 1615 linked_ptr<EventResponseDelta> d1( |
| 1587 new EventResponseDelta("extid1", base::Time::FromInternalValue(2000))); | 1616 new EventResponseDelta("extid1", base::Time::FromInternalValue(2000))); |
| 1588 d1->auth_credentials.reset(new net::AuthCredentials(username, password)); | 1617 d1->auth_credentials.reset(new net::AuthCredentials(username, password)); |
| 1589 deltas.push_back(d1); | 1618 deltas.push_back(d1); |
| 1590 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1619 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1591 conflicting_extensions.clear(); | |
| 1592 capturing_net_log.Clear(); | 1620 capturing_net_log.Clear(); |
| 1593 net::AuthCredentials auth1; | 1621 net::AuthCredentials auth1; |
| 1594 credentials_set = MergeOnAuthRequiredResponses( | 1622 credentials_set = MergeOnAuthRequiredResponses( |
| 1595 deltas, &auth1, &conflicting_extensions, &net_log); | 1623 deltas, &auth1, &warning_set, &net_log); |
| 1624 warnings = warning_set.Release(); |
| 1596 EXPECT_TRUE(credentials_set); | 1625 EXPECT_TRUE(credentials_set); |
| 1597 EXPECT_FALSE(auth1.Empty()); | 1626 EXPECT_FALSE(auth1.Empty()); |
| 1598 EXPECT_EQ(username, auth1.username()); | 1627 EXPECT_EQ(username, auth1.username()); |
| 1599 EXPECT_EQ(password, auth1.password()); | 1628 EXPECT_EQ(password, auth1.password()); |
| 1600 EXPECT_EQ(0u, conflicting_extensions.size()); | 1629 EXPECT_EQ(0u, warnings.size()); |
| 1601 EXPECT_EQ(1u, capturing_net_log.GetSize()); | 1630 EXPECT_EQ(1u, capturing_net_log.GetSize()); |
| 1602 | 1631 |
| 1603 // Check that we set AuthCredentials only once. | 1632 // Check that we set AuthCredentials only once. |
| 1604 linked_ptr<EventResponseDelta> d2( | 1633 linked_ptr<EventResponseDelta> d2( |
| 1605 new EventResponseDelta("extid2", base::Time::FromInternalValue(1500))); | 1634 new EventResponseDelta("extid2", base::Time::FromInternalValue(1500))); |
| 1606 d2->auth_credentials.reset(new net::AuthCredentials(username, password2)); | 1635 d2->auth_credentials.reset(new net::AuthCredentials(username, password2)); |
| 1607 deltas.push_back(d2); | 1636 deltas.push_back(d2); |
| 1608 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1637 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1609 conflicting_extensions.clear(); | |
| 1610 capturing_net_log.Clear(); | 1638 capturing_net_log.Clear(); |
| 1611 net::AuthCredentials auth2; | 1639 net::AuthCredentials auth2; |
| 1612 credentials_set = MergeOnAuthRequiredResponses( | 1640 credentials_set = MergeOnAuthRequiredResponses( |
| 1613 deltas, &auth2, &conflicting_extensions, &net_log); | 1641 deltas, &auth2, &warning_set, &net_log); |
| 1642 warnings = warning_set.Release(); |
| 1614 EXPECT_TRUE(credentials_set); | 1643 EXPECT_TRUE(credentials_set); |
| 1615 EXPECT_FALSE(auth2.Empty()); | 1644 EXPECT_FALSE(auth2.Empty()); |
| 1616 EXPECT_EQ(username, auth1.username()); | 1645 EXPECT_EQ(username, auth1.username()); |
| 1617 EXPECT_EQ(password, auth1.password()); | 1646 EXPECT_EQ(password, auth1.password()); |
| 1618 EXPECT_EQ(1u, conflicting_extensions.size()); | 1647 EXPECT_EQ(1u, warnings.size()); |
| 1619 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2")); | 1648 EXPECT_TRUE(HasWarning(warnings, "extid2")); |
| 1620 EXPECT_EQ(2u, capturing_net_log.GetSize()); | 1649 EXPECT_EQ(2u, capturing_net_log.GetSize()); |
| 1621 | 1650 |
| 1622 // Check that we can set identical AuthCredentials twice without causing | 1651 // Check that we can set identical AuthCredentials twice without causing |
| 1623 // a conflict. | 1652 // a conflict. |
| 1624 linked_ptr<EventResponseDelta> d3( | 1653 linked_ptr<EventResponseDelta> d3( |
| 1625 new EventResponseDelta("extid3", base::Time::FromInternalValue(1000))); | 1654 new EventResponseDelta("extid3", base::Time::FromInternalValue(1000))); |
| 1626 d3->auth_credentials.reset(new net::AuthCredentials(username, password)); | 1655 d3->auth_credentials.reset(new net::AuthCredentials(username, password)); |
| 1627 deltas.push_back(d3); | 1656 deltas.push_back(d3); |
| 1628 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); | 1657 deltas.sort(&InDecreasingExtensionInstallationTimeOrder); |
| 1629 conflicting_extensions.clear(); | |
| 1630 capturing_net_log.Clear(); | 1658 capturing_net_log.Clear(); |
| 1631 net::AuthCredentials auth3; | 1659 net::AuthCredentials auth3; |
| 1632 credentials_set = MergeOnAuthRequiredResponses( | 1660 credentials_set = MergeOnAuthRequiredResponses( |
| 1633 deltas, &auth3, &conflicting_extensions, &net_log); | 1661 deltas, &auth3, &warning_set, &net_log); |
| 1662 warnings = warning_set.Release(); |
| 1634 EXPECT_TRUE(credentials_set); | 1663 EXPECT_TRUE(credentials_set); |
| 1635 EXPECT_FALSE(auth3.Empty()); | 1664 EXPECT_FALSE(auth3.Empty()); |
| 1636 EXPECT_EQ(username, auth1.username()); | 1665 EXPECT_EQ(username, auth1.username()); |
| 1637 EXPECT_EQ(password, auth1.password()); | 1666 EXPECT_EQ(password, auth1.password()); |
| 1638 EXPECT_EQ(1u, conflicting_extensions.size()); | 1667 EXPECT_EQ(1u, warnings.size()); |
| 1639 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2")); | 1668 EXPECT_TRUE(HasWarning(warnings, "extid2")); |
| 1640 EXPECT_EQ(3u, capturing_net_log.GetSize()); | 1669 EXPECT_EQ(3u, capturing_net_log.GetSize()); |
| 1641 } | 1670 } |
| 1642 | |
| OLD | NEW |