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

Unified Diff: ios/web/net/request_tracker_impl_unittest.mm

Issue 2617243002: Remove ScopedVector from ios/. (Closed)
Patch Set: rebase Created 3 years, 11 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web/net/request_tracker_impl.mm ('k') | ios/web/public/webui/web_ui_ios.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/net/request_tracker_impl_unittest.mm
diff --git a/ios/web/net/request_tracker_impl_unittest.mm b/ios/web/net/request_tracker_impl_unittest.mm
index b88873cb3526b89a67d5a564c6f788911b251514..08750870a298e31b023df3bce495f4d13615d136 100644
--- a/ios/web/net/request_tracker_impl_unittest.mm
+++ b/ios/web/net/request_tracker_impl_unittest.mm
@@ -6,11 +6,13 @@
#include <stddef.h>
+#include <memory>
+#include <vector>
+
#include "base/logging.h"
#import "base/mac/scoped_nsobject.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
-#include "base/memory/scoped_vector.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/sys_string_conversions.h"
@@ -172,8 +174,8 @@ class RequestTrackerTest : public PlatformTest {
scoped_refptr<web::RequestTrackerImpl> tracker_;
base::scoped_nsobject<NSString> request_group_id_;
web::TestBrowserState browser_state_;
- ScopedVector<net::URLRequestContext> contexts_;
- ScopedVector<net::URLRequest> requests_;
+ std::vector<std::unique_ptr<net::URLRequestContext>> contexts_;
+ std::vector<std::unique_ptr<net::URLRequest>> requests_;
net::URLRequestJobFactoryImpl job_factory_;
GURL GetURL(size_t i) {
@@ -254,11 +256,9 @@ class RequestTrackerTest : public PlatformTest {
url = GetURL(requests_.size());
while (i >= requests_.size()) {
- contexts_.push_back(new net::URLRequestContext());
- requests_.push_back(
- contexts_[i]
- ->CreateRequest(url, net::DEFAULT_PRIORITY, &request_delegate_)
- .release());
+ contexts_.push_back(base::MakeUnique<net::URLRequestContext>());
+ requests_.push_back(contexts_[i]->CreateRequest(
+ url, net::DEFAULT_PRIORITY, &request_delegate_));
if (secure) {
// Put a valid SSLInfo inside
@@ -274,7 +274,7 @@ class RequestTrackerTest : public PlatformTest {
}
}
EXPECT_TRUE(!secure == !requests_[i]->url().SchemeIsCryptographic());
- return requests_[i];
+ return requests_[i].get();
}
DummyURLRequestDelegate request_delegate_;
« no previous file with comments | « ios/web/net/request_tracker_impl.mm ('k') | ios/web/public/webui/web_ui_ios.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698