GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1

net/test/embedded_test_server/embedded_test_server_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread.h"
 #include "net/http/http_response_headers.h"
 #include "net/test/embedded_test_server/http_request.h"
@@ skipping 67 matching lines @@
     num_responses_expected_ = num_responses;
     // Will be terminated in OnURLFetchComplete().
     base::MessageLoop::current()->Run();
   }
 
   // Handles |request| sent to |path| and returns the response per |content|,
   // |content type|, and |code|. Saves the request URL for verification.
   scoped_ptr<HttpResponse> HandleRequest(const std::string& path,
                                          const std::string& content,
                                          const std::string& content_type,
-                                         ResponseCode code,
+                                         HttpStatusCode code,
                                          const HttpRequest& request) {
     request_relative_url_ = request.relative_url;
 
     GURL absolute_url = server_->GetURL(request.relative_url);
     if (absolute_url.path() == path) {
       scoped_ptr<BasicHttpResponse> http_response(new BasicHttpResponse);
       http_response->set_code(code);
       http_response->set_content(content);
       http_response->set_content_type(content_type);
       return http_response.PassAs<HttpResponse>();
@@ skipping 22 matching lines @@
             server_->GetURL("/path?query=foo").spec());
 }
 
 TEST_F(EmbeddedTestServerTest, RegisterRequestHandler) {
   server_->RegisterRequestHandler(
       base::Bind(&EmbeddedTestServerTest::HandleRequest,
                  base::Unretained(this),
                  "/test",
                  "<b>Worked!</b>",
                  "text/html",
-                 SUCCESS));
+                 HTTP_OK));
 
   scoped_ptr<URLFetcher> fetcher(
       URLFetcher::Create(server_->GetURL("/test?q=foo"),
                               URLFetcher::GET,
                               this));
   fetcher->SetRequestContext(request_context_getter_.get());
   fetcher->Start();
   WaitForResponses(1);
 
   EXPECT_EQ(URLRequestStatus::SUCCESS, fetcher->GetStatus().status());
-  EXPECT_EQ(SUCCESS, fetcher->GetResponseCode());
+  EXPECT_EQ(HTTP_OK, fetcher->GetResponseCode());
   EXPECT_EQ("<b>Worked!</b>", GetContentFromFetcher(*fetcher));
   EXPECT_EQ("text/html", GetContentTypeFromFetcher(*fetcher));
 
   EXPECT_EQ("/test?q=foo", request_relative_url_);
 }
 
 TEST_F(EmbeddedTestServerTest, ServeFilesFromDirectory) {
   base::FilePath src_dir;
   ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));
   server_->ServeFilesFromDirectory(
       src_dir.AppendASCII("net").AppendASCII("data"));
 
   scoped_ptr<URLFetcher> fetcher(
       URLFetcher::Create(server_->GetURL("/test.html"),
                               URLFetcher::GET,
                               this));
   fetcher->SetRequestContext(request_context_getter_.get());
   fetcher->Start();
   WaitForResponses(1);
 
   EXPECT_EQ(URLRequestStatus::SUCCESS, fetcher->GetStatus().status());
-  EXPECT_EQ(SUCCESS, fetcher->GetResponseCode());
+  EXPECT_EQ(HTTP_OK, fetcher->GetResponseCode());
   EXPECT_EQ("<p>Hello World!</p>", GetContentFromFetcher(*fetcher));
   EXPECT_EQ("", GetContentTypeFromFetcher(*fetcher));
 }
 
 TEST_F(EmbeddedTestServerTest, DefaultNotFoundResponse) {
   scoped_ptr<URLFetcher> fetcher(
       URLFetcher::Create(server_->GetURL("/non-existent"),
                               URLFetcher::GET,
                               this));
   fetcher->SetRequestContext(request_context_getter_.get());
 
   fetcher->Start();
   WaitForResponses(1);
   EXPECT_EQ(URLRequestStatus::SUCCESS, fetcher->GetStatus().status());
-  EXPECT_EQ(NOT_FOUND, fetcher->GetResponseCode());
+  EXPECT_EQ(HTTP_NOT_FOUND, fetcher->GetResponseCode());
 }
 
 TEST_F(EmbeddedTestServerTest, ConcurrentFetches) {
   server_->RegisterRequestHandler(
       base::Bind(&EmbeddedTestServerTest::HandleRequest,
                  base::Unretained(this),
                  "/test1",
                  "Raspberry chocolate",
                  "text/html",
-                 SUCCESS));
+                 HTTP_OK));
   server_->RegisterRequestHandler(
       base::Bind(&EmbeddedTestServerTest::HandleRequest,
                  base::Unretained(this),
                  "/test2",
                  "Vanilla chocolate",
                  "text/html",
-                 SUCCESS));
+                 HTTP_OK));
   server_->RegisterRequestHandler(
       base::Bind(&EmbeddedTestServerTest::HandleRequest,
                  base::Unretained(this),
                  "/test3",
                  "No chocolates",
                  "text/plain",
-                 NOT_FOUND));
+                 HTTP_NOT_FOUND));
 
   scoped_ptr<URLFetcher> fetcher1 = scoped_ptr<URLFetcher>(
       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));
   fetcher2->SetRequestContext(request_context_getter_.get());
   scoped_ptr<URLFetcher> fetcher3 = scoped_ptr<URLFetcher>(
       URLFetcher::Create(server_->GetURL("/test3"),
                               URLFetcher::GET,
                               this));
   fetcher3->SetRequestContext(request_context_getter_.get());
 
   // Fetch the three URLs concurrently.
   fetcher1->Start();
   fetcher2->Start();
   fetcher3->Start();
   WaitForResponses(3);
 
   EXPECT_EQ(URLRequestStatus::SUCCESS, fetcher1->GetStatus().status());
-  EXPECT_EQ(SUCCESS, fetcher1->GetResponseCode());
+  EXPECT_EQ(HTTP_OK, fetcher1->GetResponseCode());
   EXPECT_EQ("Raspberry chocolate", GetContentFromFetcher(*fetcher1));
   EXPECT_EQ("text/html", GetContentTypeFromFetcher(*fetcher1));
 
   EXPECT_EQ(URLRequestStatus::SUCCESS, fetcher2->GetStatus().status());
-  EXPECT_EQ(SUCCESS, fetcher2->GetResponseCode());
+  EXPECT_EQ(HTTP_OK, fetcher2->GetResponseCode());
   EXPECT_EQ("Vanilla chocolate", GetContentFromFetcher(*fetcher2));
   EXPECT_EQ("text/html", GetContentTypeFromFetcher(*fetcher2));
 
   EXPECT_EQ(URLRequestStatus::SUCCESS, fetcher3->GetStatus().status());
-  EXPECT_EQ(NOT_FOUND, fetcher3->GetResponseCode());
+  EXPECT_EQ(HTTP_NOT_FOUND, fetcher3->GetResponseCode());
   EXPECT_EQ("No chocolates", GetContentFromFetcher(*fetcher3));
   EXPECT_EQ("text/plain", GetContentTypeFromFetcher(*fetcher3));
 }
 
 }  // namespace test_server
 }  // namespace net