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/extensions/api/web_request/web_request_api.h" | 5 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 #include "extensions/common/extension_messages.h" | 58 #include "extensions/common/extension_messages.h" |
59 #include "extensions/common/extension_set.h" | 59 #include "extensions/common/extension_set.h" |
60 #include "extensions/common/features/feature.h" | 60 #include "extensions/common/features/feature.h" |
61 #include "extensions/common/permissions/permissions_data.h" | 61 #include "extensions/common/permissions/permissions_data.h" |
62 #include "extensions/common/url_pattern.h" | 62 #include "extensions/common/url_pattern.h" |
63 #include "grit/generated_resources.h" | 63 #include "grit/generated_resources.h" |
64 #include "net/base/auth.h" | 64 #include "net/base/auth.h" |
65 #include "net/base/net_errors.h" | 65 #include "net/base/net_errors.h" |
66 #include "net/base/upload_data_stream.h" | 66 #include "net/base/upload_data_stream.h" |
67 #include "net/http/http_response_headers.h" | 67 #include "net/http/http_response_headers.h" |
| 68 #include "net/http/http_util.h" |
68 #include "net/url_request/url_request.h" | 69 #include "net/url_request/url_request.h" |
69 #include "ui/base/l10n/l10n_util.h" | 70 #include "ui/base/l10n/l10n_util.h" |
70 #include "url/gurl.h" | 71 #include "url/gurl.h" |
71 | 72 |
72 using base::DictionaryValue; | 73 using base::DictionaryValue; |
73 using base::ListValue; | 74 using base::ListValue; |
74 using base::StringValue; | 75 using base::StringValue; |
75 using content::BrowserMessageFilter; | 76 using content::BrowserMessageFilter; |
76 using content::BrowserThread; | 77 using content::BrowserThread; |
77 using content::ResourceRequestInfo; | 78 using content::ResourceRequestInfo; |
(...skipping 2303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2381 std::string serialized_header; | 2382 std::string serialized_header; |
2382 base::JSONWriter::Write(header_value, &serialized_header); | 2383 base::JSONWriter::Write(header_value, &serialized_header); |
2383 RespondWithError(event_name, | 2384 RespondWithError(event_name, |
2384 sub_event_name, | 2385 sub_event_name, |
2385 request_id, | 2386 request_id, |
2386 response.Pass(), | 2387 response.Pass(), |
2387 ErrorUtils::FormatErrorMessage(keys::kInvalidHeader, | 2388 ErrorUtils::FormatErrorMessage(keys::kInvalidHeader, |
2388 serialized_header)); | 2389 serialized_header)); |
2389 return false; | 2390 return false; |
2390 } | 2391 } |
2391 if (!helpers::IsValidHeaderName(name)) { | 2392 if (!net::HttpUtil::IsValidHeaderName(name)) { |
2392 RespondWithError(event_name, | 2393 RespondWithError(event_name, |
2393 sub_event_name, | 2394 sub_event_name, |
2394 request_id, | 2395 request_id, |
2395 response.Pass(), | 2396 response.Pass(), |
2396 keys::kInvalidHeaderName); | 2397 keys::kInvalidHeaderName); |
2397 return false; | 2398 return false; |
2398 } | 2399 } |
2399 if (!helpers::IsValidHeaderValue(value)) { | 2400 if (!net::HttpUtil::IsValidHeaderValue(value)) { |
2400 RespondWithError(event_name, | 2401 RespondWithError(event_name, |
2401 sub_event_name, | 2402 sub_event_name, |
2402 request_id, | 2403 request_id, |
2403 response.Pass(), | 2404 response.Pass(), |
2404 ErrorUtils::FormatErrorMessage( | 2405 ErrorUtils::FormatErrorMessage( |
2405 keys::kInvalidHeaderValue, name)); | 2406 keys::kInvalidHeaderValue, name)); |
2406 return false; | 2407 return false; |
2407 } | 2408 } |
2408 if (hasRequestHeaders) | 2409 if (hasRequestHeaders) |
2409 request_headers->SetHeader(name, value); | 2410 request_headers->SetHeader(name, value); |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2484 extensions::RuntimeData* runtime_data = | 2485 extensions::RuntimeData* runtime_data = |
2485 extensions::ExtensionSystem::Get(profile)->runtime_data(); | 2486 extensions::ExtensionSystem::Get(profile)->runtime_data(); |
2486 for (extensions::ExtensionSet::const_iterator it = extensions.begin(); | 2487 for (extensions::ExtensionSet::const_iterator it = extensions.begin(); |
2487 !webrequest_used && it != extensions.end(); | 2488 !webrequest_used && it != extensions.end(); |
2488 ++it) { | 2489 ++it) { |
2489 webrequest_used |= runtime_data->HasUsedWebRequest(it->get()); | 2490 webrequest_used |= runtime_data->HasUsedWebRequest(it->get()); |
2490 } | 2491 } |
2491 | 2492 |
2492 host->Send(new ExtensionMsg_UsingWebRequestAPI(webrequest_used)); | 2493 host->Send(new ExtensionMsg_UsingWebRequestAPI(webrequest_used)); |
2493 } | 2494 } |
OLD | NEW |