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

Unified Diff: net/test/embedded_test_server/embedded_test_server_unittest.cc

Issue 1117703002: Adjust URLFetcher::Create API so that object is returned as scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unneeded Pass() calls Created 5 years, 8 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/server/http_server_unittest.cc ('k') | net/tools/get_server_time/get_server_time.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/embedded_test_server/embedded_test_server_unittest.cc
diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc
index efa4b0c2211adf0438277c78455dedbcf43bf247..b5d72f2a1e6873ca605318199f9b8de6871178b8 100644
--- a/net/test/embedded_test_server/embedded_test_server_unittest.cc
+++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc
@@ -137,10 +137,8 @@ TEST_F(EmbeddedTestServerTest, RegisterRequestHandler) {
"text/html",
HTTP_OK));
- scoped_ptr<URLFetcher> fetcher(
- URLFetcher::Create(server_->GetURL("/test?q=foo"),
- URLFetcher::GET,
- this));
+ scoped_ptr<URLFetcher> fetcher =
+ URLFetcher::Create(server_->GetURL("/test?q=foo"), URLFetcher::GET, this);
fetcher->SetRequestContext(request_context_getter_.get());
fetcher->Start();
WaitForResponses(1);
@@ -159,10 +157,8 @@ TEST_F(EmbeddedTestServerTest, ServeFilesFromDirectory) {
server_->ServeFilesFromDirectory(
src_dir.AppendASCII("net").AppendASCII("data"));
- scoped_ptr<URLFetcher> fetcher(
- URLFetcher::Create(server_->GetURL("/test.html"),
- URLFetcher::GET,
- this));
+ scoped_ptr<URLFetcher> fetcher =
+ URLFetcher::Create(server_->GetURL("/test.html"), URLFetcher::GET, this);
fetcher->SetRequestContext(request_context_getter_.get());
fetcher->Start();
WaitForResponses(1);
@@ -174,10 +170,8 @@ TEST_F(EmbeddedTestServerTest, ServeFilesFromDirectory) {
}
TEST_F(EmbeddedTestServerTest, DefaultNotFoundResponse) {
- scoped_ptr<URLFetcher> fetcher(
- URLFetcher::Create(server_->GetURL("/non-existent"),
- URLFetcher::GET,
- this));
+ scoped_ptr<URLFetcher> fetcher = URLFetcher::Create(
+ server_->GetURL("/non-existent"), URLFetcher::GET, this);
fetcher->SetRequestContext(request_context_getter_.get());
fetcher->Start();
@@ -209,20 +203,14 @@ TEST_F(EmbeddedTestServerTest, ConcurrentFetches) {
"text/plain",
HTTP_NOT_FOUND));
- scoped_ptr<URLFetcher> fetcher1 = scoped_ptr<URLFetcher>(
- URLFetcher::Create(server_->GetURL("/test1"),
- URLFetcher::GET,
- this));
+ scoped_ptr<URLFetcher> fetcher1 =
+ URLFetcher::Create(server_->GetURL("/test1"), URLFetcher::GET, this);
fetcher1->SetRequestContext(request_context_getter_.get());
- scoped_ptr<URLFetcher> fetcher2 = scoped_ptr<URLFetcher>(
- URLFetcher::Create(server_->GetURL("/test2"),
- URLFetcher::GET,
- this));
+ scoped_ptr<URLFetcher> fetcher2 =
+ URLFetcher::Create(server_->GetURL("/test2"), URLFetcher::GET, this);
fetcher2->SetRequestContext(request_context_getter_.get());
- scoped_ptr<URLFetcher> fetcher3 = scoped_ptr<URLFetcher>(
- URLFetcher::Create(server_->GetURL("/test3"),
- URLFetcher::GET,
- this));
+ scoped_ptr<URLFetcher> fetcher3 =
+ URLFetcher::Create(server_->GetURL("/test3"), URLFetcher::GET, this);
fetcher3->SetRequestContext(request_context_getter_.get());
// Fetch the three URLs concurrently.
@@ -289,8 +277,8 @@ class EmbeddedTestServerThreadingTestDelegate
if (!loop)
loop.reset(new base::MessageLoopForIO);
- scoped_ptr<URLFetcher> fetcher(URLFetcher::Create(
- server.GetURL("/test?q=foo"), URLFetcher::GET, this));
+ scoped_ptr<URLFetcher> fetcher =
+ URLFetcher::Create(server.GetURL("/test?q=foo"), URLFetcher::GET, this);
fetcher->SetRequestContext(
new TestURLRequestContextGetter(loop->message_loop_proxy()));
fetcher->Start();
« no previous file with comments | « net/server/http_server_unittest.cc ('k') | net/tools/get_server_time/get_server_time.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698