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 "extensions/browser/api/web_request/web_request_api_helpers.h" | 5 #include "extensions/browser/api/web_request/web_request_api_helpers.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 const EventResponseDelta* delta, | 264 const EventResponseDelta* delta, |
265 net::NetLogCaptureMode capture_mode) { | 265 net::NetLogCaptureMode capture_mode) { |
266 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); | 266 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
267 dict->SetString("extension_id", delta->extension_id); | 267 dict->SetString("extension_id", delta->extension_id); |
268 | 268 |
269 base::ListValue* modified_headers = new base::ListValue(); | 269 base::ListValue* modified_headers = new base::ListValue(); |
270 net::HttpRequestHeaders::Iterator modification( | 270 net::HttpRequestHeaders::Iterator modification( |
271 delta->modified_request_headers); | 271 delta->modified_request_headers); |
272 while (modification.GetNext()) { | 272 while (modification.GetNext()) { |
273 std::string line = modification.name() + ": " + modification.value(); | 273 std::string line = modification.name() + ": " + modification.value(); |
274 modified_headers->Append(new base::StringValue(line)); | 274 modified_headers->AppendString(line); |
275 } | 275 } |
276 dict->Set("modified_headers", modified_headers); | 276 dict->Set("modified_headers", modified_headers); |
277 | 277 |
278 base::ListValue* deleted_headers = new base::ListValue(); | 278 base::ListValue* deleted_headers = new base::ListValue(); |
279 for (std::vector<std::string>::const_iterator key = | 279 for (std::vector<std::string>::const_iterator key = |
280 delta->deleted_request_headers.begin(); | 280 delta->deleted_request_headers.begin(); |
281 key != delta->deleted_request_headers.end(); | 281 key != delta->deleted_request_headers.end(); |
282 ++key) { | 282 ++key) { |
283 deleted_headers->Append(new base::StringValue(*key)); | 283 deleted_headers->AppendString(*key); |
284 } | 284 } |
285 dict->Set("deleted_headers", deleted_headers); | 285 dict->Set("deleted_headers", deleted_headers); |
286 return std::move(dict); | 286 return std::move(dict); |
287 } | 287 } |
288 | 288 |
289 bool InDecreasingExtensionInstallationTimeOrder( | 289 bool InDecreasingExtensionInstallationTimeOrder( |
290 const linked_ptr<EventResponseDelta>& a, | 290 const linked_ptr<EventResponseDelta>& a, |
291 const linked_ptr<EventResponseDelta>& b) { | 291 const linked_ptr<EventResponseDelta>& b) { |
292 return a->extension_install_time > b->extension_install_time; | 292 return a->extension_install_time > b->extension_install_time; |
293 } | 293 } |
294 | 294 |
295 base::ListValue* StringToCharList(const std::string& s) { | 295 base::ListValue* StringToCharList(const std::string& s) { |
296 base::ListValue* result = new base::ListValue; | 296 base::ListValue* result = new base::ListValue; |
297 for (size_t i = 0, n = s.size(); i < n; ++i) { | 297 for (size_t i = 0, n = s.size(); i < n; ++i) { |
298 result->Append( | 298 result->AppendInteger(*reinterpret_cast<const unsigned char*>(&s[i])); |
299 new base::FundamentalValue( | |
300 *reinterpret_cast<const unsigned char*>(&s[i]))); | |
301 } | 299 } |
302 return result; | 300 return result; |
303 } | 301 } |
304 | 302 |
305 bool CharListToString(const base::ListValue* list, std::string* out) { | 303 bool CharListToString(const base::ListValue* list, std::string* out) { |
306 if (!list) | 304 if (!list) |
307 return false; | 305 return false; |
308 const size_t list_length = list->GetSize(); | 306 const size_t list_length = list->GetSize(); |
309 out->resize(list_length); | 307 out->resize(list_length); |
310 int value = 0; | 308 int value = 0; |
(...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1318 for (size_t i = 0; i < kResourceTypeStringsLength; ++i) { | 1316 for (size_t i = 0; i < kResourceTypeStringsLength; ++i) { |
1319 if (type_str == kResourceTypeStrings[i]) { | 1317 if (type_str == kResourceTypeStrings[i]) { |
1320 found = true; | 1318 found = true; |
1321 types->push_back(kResourceTypeValues[i]); | 1319 types->push_back(kResourceTypeValues[i]); |
1322 } | 1320 } |
1323 } | 1321 } |
1324 return found; | 1322 return found; |
1325 } | 1323 } |
1326 | 1324 |
1327 } // namespace extension_web_request_api_helpers | 1325 } // namespace extension_web_request_api_helpers |
OLD | NEW |