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 9823947fb5dfdff312ce49cf46ba41ccdb3212af..f68f44b9c121055d876394cce141c036ef939ee2 100644 |
--- a/net/test/embedded_test_server/embedded_test_server_unittest.cc |
+++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc |
@@ -40,22 +40,20 @@ std::string GetContentTypeFromFetcher(const URLFetcher& fetcher) { |
} // namespace |
-class EmbeddedTestServerTest: public testing::Test, |
- public URLFetcherDelegate { |
+class EmbeddedTestServerTest : public testing::Test, public URLFetcherDelegate { |
public: |
EmbeddedTestServerTest() |
: num_responses_received_(0), |
num_responses_expected_(0), |
- io_thread_("io_thread") { |
- } |
+ io_thread_("io_thread") {} |
virtual void SetUp() OVERRIDE { |
base::Thread::Options thread_options; |
thread_options.message_loop_type = base::MessageLoop::TYPE_IO; |
ASSERT_TRUE(io_thread_.StartWithOptions(thread_options)); |
- request_context_getter_ = new TestURLRequestContextGetter( |
- io_thread_.message_loop_proxy()); |
+ request_context_getter_ = |
+ new TestURLRequestContextGetter(io_thread_.message_loop_proxy()); |
server_.reset(new EmbeddedTestServer); |
ASSERT_TRUE(server_->InitializeAndWaitUntilReady()); |
@@ -112,13 +110,13 @@ class EmbeddedTestServerTest: public testing::Test, |
TEST_F(EmbeddedTestServerTest, GetBaseURL) { |
EXPECT_EQ(base::StringPrintf("http://127.0.0.1:%d/", server_->port()), |
- server_->base_url().spec()); |
+ server_->base_url().spec()); |
} |
TEST_F(EmbeddedTestServerTest, GetURL) { |
- EXPECT_EQ(base::StringPrintf("http://127.0.0.1:%d/path?query=foo", |
- server_->port()), |
- server_->GetURL("/path?query=foo").spec()); |
+ EXPECT_EQ( |
+ base::StringPrintf("http://127.0.0.1:%d/path?query=foo", server_->port()), |
+ server_->GetURL("/path?query=foo").spec()); |
} |
TEST_F(EmbeddedTestServerTest, RegisterRequestHandler) { |
@@ -130,10 +128,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); |
@@ -153,9 +149,7 @@ TEST_F(EmbeddedTestServerTest, ServeFilesFromDirectory) { |
src_dir.AppendASCII("net").AppendASCII("data")); |
scoped_ptr<URLFetcher> fetcher( |
- URLFetcher::Create(server_->GetURL("/test.html"), |
- URLFetcher::GET, |
- this)); |
+ URLFetcher::Create(server_->GetURL("/test.html"), URLFetcher::GET, this)); |
fetcher->SetRequestContext(request_context_getter_.get()); |
fetcher->Start(); |
WaitForResponses(1); |
@@ -167,10 +161,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(); |
@@ -203,19 +195,13 @@ TEST_F(EmbeddedTestServerTest, ConcurrentFetches) { |
HTTP_NOT_FOUND)); |
scoped_ptr<URLFetcher> fetcher1 = scoped_ptr<URLFetcher>( |
- URLFetcher::Create(server_->GetURL("/test1"), |
- URLFetcher::GET, |
- this)); |
+ 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)); |
+ 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)); |
+ URLFetcher::Create(server_->GetURL("/test3"), URLFetcher::GET, this)); |
fetcher3->SetRequestContext(request_context_getter_.get()); |
// Fetch the three URLs concurrently. |
@@ -315,8 +301,7 @@ TEST_P(EmbeddedTestServerThreadingTest, RunTest) { |
// main test thread. |
base::PlatformThreadHandle thread_handle; |
EmbeddedTestServerThreadingTestDelegate delegate( |
- std::tr1::get<0>(GetParam()), |
- std::tr1::get<1>(GetParam())); |
+ std::tr1::get<0>(GetParam()), std::tr1::get<1>(GetParam())); |
ASSERT_TRUE(base::PlatformThread::Create(0, &delegate, &thread_handle)); |
base::PlatformThread::Join(thread_handle); |
} |