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

Unified Diff: content/browser/loader/resource_scheduler_unittest.cc

Issue 763833003: Remove using namespace in net/quic/quic_stream_sequencer.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/loader/resource_scheduler_unittest.cc
diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc
index fb54951f5350519dd0280178cc90ebe47567506f..80b81bbf04a9f38e65809be9cc11b6bdcf667782 100644
--- a/content/browser/loader/resource_scheduler_unittest.cc
+++ b/content/browser/loader/resource_scheduler_unittest.cc
@@ -4,6 +4,8 @@
#include "content/browser/loader/resource_scheduler.h"
+#include <string>
+
#include "base/memory/scoped_vector.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
@@ -428,7 +430,7 @@ TEST_F(ResourceSchedulerTest, LimitedNumberOfDelayableRequestsInFlight) {
ScopedVector<TestRequest> lows_singlehost;
// Queue up to the per-host limit (we subtract the current high-pri request).
for (int i = 0; i < kMaxNumDelayableRequestsPerHost - 1; ++i) {
- string url = "http://host/low" + base::IntToString(i);
+ std::string url = "http://host/low" + base::IntToString(i);
lows_singlehost.push_back(NewRequest(url.c_str(), net::LOWEST));
EXPECT_TRUE(lows_singlehost[i]->started());
}
@@ -451,7 +453,7 @@ TEST_F(ResourceSchedulerTest, LimitedNumberOfDelayableRequestsInFlight) {
EXPECT_GT(expected_slots_left, 0);
ScopedVector<TestRequest> lows_differenthosts;
for (int i = 0; i < expected_slots_left; ++i) {
- string url = "http://host" + base::IntToString(i) + "/low";
+ std::string url = "http://host" + base::IntToString(i) + "/low";
lows_differenthosts.push_back(NewRequest(url.c_str(), net::LOWEST));
EXPECT_TRUE(lows_differenthosts[i]->started());
}
@@ -490,7 +492,7 @@ TEST_F(ResourceSchedulerTest, RaisePriorityInQueue) {
const int kMaxNumDelayableRequestsPerClient = 10; // Should match the .cc.
ScopedVector<TestRequest> lows;
for (int i = 0; i < kMaxNumDelayableRequestsPerClient - 1; ++i) {
- string url = "http://host/low" + base::IntToString(i);
+ std::string url = "http://host/low" + base::IntToString(i);
lows.push_back(NewRequest(url.c_str(), net::LOWEST));
}
@@ -521,7 +523,7 @@ TEST_F(ResourceSchedulerTest, LowerPriority) {
const int kNumFillerRequests = kMaxNumDelayableRequestsPerClient - 2;
ScopedVector<TestRequest> lows;
for (int i = 0; i < kNumFillerRequests; ++i) {
- string url = "http://host" + base::IntToString(i) + "/low";
+ std::string url = "http://host" + base::IntToString(i) + "/low";
lows.push_back(NewRequest(url.c_str(), net::LOWEST));
}
@@ -545,7 +547,7 @@ TEST_F(ResourceSchedulerTest, ReprioritizedRequestGoesToBackOfQueue) {
const int kMaxNumDelayableRequestsPerClient = 10; // Should match the .cc.
ScopedVector<TestRequest> lows;
for (int i = 0; i < kMaxNumDelayableRequestsPerClient; ++i) {
- string url = "http://host/low" + base::IntToString(i);
+ std::string url = "http://host/low" + base::IntToString(i);
lows.push_back(NewRequest(url.c_str(), net::LOWEST));
}
@@ -570,7 +572,7 @@ TEST_F(ResourceSchedulerTest, HigherIntraPriorityGoesToFrontOfQueue) {
const int kMaxNumDelayableRequestsPerClient = 10; // Should match the .cc.
ScopedVector<TestRequest> lows;
for (int i = 0; i < kMaxNumDelayableRequestsPerClient; ++i) {
- string url = "http://host/low" + base::IntToString(i);
+ std::string url = "http://host/low" + base::IntToString(i);
lows.push_back(NewRequest(url.c_str(), net::IDLE));
}
@@ -650,7 +652,7 @@ TEST_F(ResourceSchedulerTest, NewSpdyHostInDelayableRequests) {
// Cancel a request after we learn the server supports SPDY.
ScopedVector<TestRequest> lows;
for (int i = 0; i < kMaxNumDelayableRequestsPerClient - 1; ++i) {
- string url = "http://host" + base::IntToString(i) + "/low";
+ std::string url = "http://host" + base::IntToString(i) + "/low";
lows.push_back(NewRequest(url.c_str(), net::LOWEST));
}
scoped_ptr<TestRequest> low1(NewRequest("http://host/low", net::LOWEST));

Powered by Google App Engine
This is Rietveld 408576698