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

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

Issue 11275223: net: Change type of UploadData::elements from std::vector to ScopedVector (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/policy/device_management_service_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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/json/json_writer.h" 10 #include "base/json/json_writer.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 extensions::UploadDataPresenter* const presenters[] = { 189 extensions::UploadDataPresenter* const presenters[] = {
190 &parsed_data_presenter, // 1: any parseable forms? (Specific to forms.) 190 &parsed_data_presenter, // 1: any parseable forms? (Specific to forms.)
191 &raw_data_presenter // 2: any data at all? (Non-specific.) 191 &raw_data_presenter // 2: any data at all? (Non-specific.)
192 }; 192 };
193 // Keys for the results of the corresponding presenters. 193 // Keys for the results of the corresponding presenters.
194 static const char* const kKeys[] = { 194 static const char* const kKeys[] = {
195 keys::kRequestBodyFormDataKey, 195 keys::kRequestBodyFormDataKey,
196 keys::kRequestBodyRawKey 196 keys::kRequestBodyRawKey
197 }; 197 };
198 198
199 const std::vector<net::UploadElement>* elements = 199 const ScopedVector<net::UploadElement>& elements =
200 request->get_upload()->elements(); 200 request->get_upload()->elements();
201 bool some_succeeded = false; 201 bool some_succeeded = false;
202 for (size_t i = 0; !some_succeeded && i < arraysize(presenters); ++i) { 202 for (size_t i = 0; !some_succeeded && i < arraysize(presenters); ++i) {
203 std::vector<net::UploadElement>::const_iterator element; 203 ScopedVector<net::UploadElement>::const_iterator element;
204 for (element = elements->begin(); element != elements->end(); ++element) 204 for (element = elements.begin(); element != elements.end(); ++element)
205 presenters[i]->FeedNext(*element); 205 presenters[i]->FeedNext(**element);
206 if (presenters[i]->Succeeded()) { 206 if (presenters[i]->Succeeded()) {
207 requestBody->Set(kKeys[i], presenters[i]->Result().release()); 207 requestBody->Set(kKeys[i], presenters[i]->Result().release());
208 some_succeeded = true; 208 some_succeeded = true;
209 } 209 }
210 } 210 }
211 if (!some_succeeded) 211 if (!some_succeeded)
212 requestBody->SetString(keys::kRequestBodyErrorKey, "Unknown error."); 212 requestBody->SetString(keys::kRequestBodyErrorKey, "Unknown error.");
213 } 213 }
214 214
215 // Converts a HttpHeaders dictionary to a |name|, |value| pair. Returns 215 // Converts a HttpHeaders dictionary to a |name|, |value| pair. Returns
(...skipping 1693 matching lines...) Expand 10 before | Expand all | Expand 10 after
1909 } else if ((*it)->name().find("AdBlock") != std::string::npos) { 1909 } else if ((*it)->name().find("AdBlock") != std::string::npos) {
1910 adblock = true; 1910 adblock = true;
1911 } else { 1911 } else {
1912 other = true; 1912 other = true;
1913 } 1913 }
1914 } 1914 }
1915 } 1915 }
1916 1916
1917 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other)); 1917 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other));
1918 } 1918 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/device_management_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698