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

Unified Diff: net/url_request/url_request_throttler_simulation_unittest.cc

Issue 501163002: Make URLRequest's constructor private, and make URLRequestContext a friend class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge yet again Created 6 years, 3 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 | « net/url_request/url_request_test_util.cc ('k') | net/url_request/url_request_throttler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_throttler_simulation_unittest.cc
diff --git a/net/url_request/url_request_throttler_simulation_unittest.cc b/net/url_request/url_request_throttler_simulation_unittest.cc
index 14b20406a74fb0450332b6d592cff91b4658ef0c..d8063763282caf7376b5327e52845914233e9196 100644
--- a/net/url_request/url_request_throttler_simulation_unittest.cc
+++ b/net/url_request/url_request_throttler_simulation_unittest.cc
@@ -17,10 +17,12 @@
#include <vector>
#include "base/environment.h"
+#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/rand_util.h"
#include "base/time/time.h"
#include "net/base/request_priority.h"
+#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_test_util.h"
#include "net/url_request/url_request_throttler_manager.h"
@@ -125,7 +127,8 @@ class Server : public DiscreteTimeSimulation::Actor {
num_current_tick_queries_(0),
num_overloaded_ticks_(0),
max_experienced_queries_per_tick_(0),
- mock_request_(GURL(), DEFAULT_PRIORITY, NULL, &context_) {}
+ mock_request_(context_.CreateRequest(
+ GURL(), DEFAULT_PRIORITY, NULL, NULL)) {}
void SetDowntime(const TimeTicks& start_time, const TimeDelta& duration) {
start_downtime_ = start_time;
@@ -189,7 +192,7 @@ class Server : public DiscreteTimeSimulation::Actor {
}
const URLRequest& mock_request() const {
- return mock_request_;
+ return *mock_request_.get();
}
std::string VisualizeASCII(int terminal_width) {
@@ -291,7 +294,7 @@ class Server : public DiscreteTimeSimulation::Actor {
std::vector<int> requests_per_tick_;
TestURLRequestContext context_;
- TestURLRequest mock_request_;
+ scoped_ptr<URLRequest> mock_request_;
DISALLOW_COPY_AND_ASSIGN(Server);
};
« no previous file with comments | « net/url_request/url_request_test_util.cc ('k') | net/url_request/url_request_throttler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698