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.h" | 5 #include "extensions/browser/api/web_request/web_request_api.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> |
8 | 9 |
9 #include "base/bind.h" | 10 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
11 #include "base/json/json_writer.h" | 12 #include "base/json/json_writer.h" |
12 #include "base/lazy_instance.h" | 13 #include "base/lazy_instance.h" |
13 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/memory/scoped_ptr.h" |
14 #include "base/metrics/histogram.h" | 16 #include "base/metrics/histogram.h" |
15 #include "base/strings/string_number_conversions.h" | 17 #include "base/strings/string_number_conversions.h" |
16 #include "base/strings/string_util.h" | 18 #include "base/strings/string_util.h" |
17 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
18 #include "base/time/time.h" | 20 #include "base/time/time.h" |
19 #include "base/values.h" | 21 #include "base/values.h" |
20 #include "content/public/browser/browser_message_filter.h" | 22 #include "content/public/browser/browser_message_filter.h" |
21 #include "content/public/browser/browser_thread.h" | 23 #include "content/public/browser/browser_thread.h" |
22 #include "content/public/browser/render_frame_host.h" | 24 #include "content/public/browser/render_frame_host.h" |
23 #include "content/public/browser/render_process_host.h" | 25 #include "content/public/browser/render_process_host.h" |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 UploadDataPresenter* const presenters[] = { | 244 UploadDataPresenter* const presenters[] = { |
243 &parsed_data_presenter, // 1: any parseable forms? (Specific to forms.) | 245 &parsed_data_presenter, // 1: any parseable forms? (Specific to forms.) |
244 &raw_data_presenter // 2: any data at all? (Non-specific.) | 246 &raw_data_presenter // 2: any data at all? (Non-specific.) |
245 }; | 247 }; |
246 // Keys for the results of the corresponding presenters. | 248 // Keys for the results of the corresponding presenters. |
247 static const char* const kKeys[] = { | 249 static const char* const kKeys[] = { |
248 keys::kRequestBodyFormDataKey, | 250 keys::kRequestBodyFormDataKey, |
249 keys::kRequestBodyRawKey | 251 keys::kRequestBodyRawKey |
250 }; | 252 }; |
251 | 253 |
252 const ScopedVector<net::UploadElementReader>* readers = | 254 const std::vector<scoped_ptr<net::UploadElementReader>>* readers = |
253 upload_data->GetElementReaders(); | 255 upload_data->GetElementReaders(); |
254 bool some_succeeded = false; | 256 bool some_succeeded = false; |
255 if (readers) { | 257 if (readers) { |
256 for (size_t i = 0; i < arraysize(presenters); ++i) { | 258 for (size_t i = 0; i < arraysize(presenters); ++i) { |
257 for (const auto& reader : *readers) | 259 for (const auto& reader : *readers) |
258 presenters[i]->FeedNext(*reader); | 260 presenters[i]->FeedNext(*reader); |
259 if (presenters[i]->Succeeded()) { | 261 if (presenters[i]->Succeeded()) { |
260 request_body->Set(kKeys[i], presenters[i]->Result().release()); | 262 request_body->Set(kKeys[i], presenters[i]->Result().release()); |
261 some_succeeded = true; | 263 some_succeeded = true; |
262 break; | 264 break; |
(...skipping 2219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2482 // Continue gracefully. | 2484 // Continue gracefully. |
2483 RunSync(); | 2485 RunSync(); |
2484 } | 2486 } |
2485 | 2487 |
2486 bool WebRequestHandlerBehaviorChangedFunction::RunSync() { | 2488 bool WebRequestHandlerBehaviorChangedFunction::RunSync() { |
2487 helpers::ClearCacheOnNavigation(); | 2489 helpers::ClearCacheOnNavigation(); |
2488 return true; | 2490 return true; |
2489 } | 2491 } |
2490 | 2492 |
2491 } // namespace extensions | 2493 } // namespace extensions |
OLD | NEW |