Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: extensions/browser/api/web_request/web_request_api.cc

Issue 1476443002: Remove ScopedVector from ElementsUploadDataStream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 UploadDataPresenter* const presenters[] = { 242 UploadDataPresenter* const presenters[] = {
243 &parsed_data_presenter, // 1: any parseable forms? (Specific to forms.) 243 &parsed_data_presenter, // 1: any parseable forms? (Specific to forms.)
244 &raw_data_presenter // 2: any data at all? (Non-specific.) 244 &raw_data_presenter // 2: any data at all? (Non-specific.)
245 }; 245 };
246 // Keys for the results of the corresponding presenters. 246 // Keys for the results of the corresponding presenters.
247 static const char* const kKeys[] = { 247 static const char* const kKeys[] = {
248 keys::kRequestBodyFormDataKey, 248 keys::kRequestBodyFormDataKey,
249 keys::kRequestBodyRawKey 249 keys::kRequestBodyRawKey
250 }; 250 };
251 251
252 const ScopedVector<net::UploadElementReader>* readers = 252 const std::vector<scoped_ptr<net::UploadElementReader>>* readers =
mmenke 2015/11/24 17:25:08 include <vector>, scoped_ptr
253 upload_data->GetElementReaders(); 253 upload_data->GetElementReaders();
254 bool some_succeeded = false; 254 bool some_succeeded = false;
255 if (readers) { 255 if (readers) {
256 for (size_t i = 0; i < arraysize(presenters); ++i) { 256 for (size_t i = 0; i < arraysize(presenters); ++i) {
257 for (const auto& reader : *readers) 257 for (const auto& reader : *readers)
258 presenters[i]->FeedNext(*reader); 258 presenters[i]->FeedNext(*reader);
259 if (presenters[i]->Succeeded()) { 259 if (presenters[i]->Succeeded()) {
260 request_body->Set(kKeys[i], presenters[i]->Result().release()); 260 request_body->Set(kKeys[i], presenters[i]->Result().release());
261 some_succeeded = true; 261 some_succeeded = true;
262 break; 262 break;
(...skipping 2219 matching lines...) Expand 10 before | Expand all | Expand 10 after
2482 // Continue gracefully. 2482 // Continue gracefully.
2483 RunSync(); 2483 RunSync();
2484 } 2484 }
2485 2485
2486 bool WebRequestHandlerBehaviorChangedFunction::RunSync() { 2486 bool WebRequestHandlerBehaviorChangedFunction::RunSync() {
2487 helpers::ClearCacheOnNavigation(); 2487 helpers::ClearCacheOnNavigation();
2488 return true; 2488 return true;
2489 } 2489 }
2490 2490
2491 } // namespace extensions 2491 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698