GTTF: Convert WebContentsImplBrowserTest to use EmbeddedTestServer.

net/test/embedded_test_server/embedded_test_server.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/bind.h"
+#include "base/files/file_path.h"
+#include "base/file_util.h"
+#include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "base/threading/thread_restrictions.h"
 #include "net/test/embedded_test_server/http_connection.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "net/tools/fetch/http_listen_socket.h"
 
 namespace net {
 namespace test_server {
 
 namespace {
 
 const int kPort = 8040;
 const char kIp[] = "127.0.0.1";
 const int kRetries = 10;
 
 // Callback to handle requests with default predefined response for requests
 // matching the address |url|.
 scoped_ptr<HttpResponse> HandleDefaultRequest(const GURL& url,
                                               const HttpResponse& response,
                                               const HttpRequest& request) {
   const GURL request_url = url.Resolve(request.relative_url);
   if (url.path() != request_url.path())
     return scoped_ptr<HttpResponse>(NULL);
   return scoped_ptr<HttpResponse>(new HttpResponse(response));
 }
 
+scoped_ptr<HttpResponse> HandleFileRequest(const base::FilePath& file_path,

[satorux1, 2013/05/16 04:57:59]

function comment is missing.

[satorux1, 2013/05/16 04:57:59]

file_path -> directory_path ?

+                                           const HttpRequest& request) {
+  // This is a test-only server. Ignore I/O thread restrictions.
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
+
+  std::string file_contents;

[satorux1, 2013/05/16 04:57:59]

Maybe: 

// Trim the first byte ('/').

+  if (!file_util::ReadFileToString(
+          file_path.AppendASCII(request.relative_url.substr(1)),
+          &file_contents)) {
+    return scoped_ptr<HttpResponse>(NULL);
+  }
+
+  scoped_ptr<HttpResponse> http_response(new HttpResponse);
+  http_response->set_code(net::test_server::SUCCESS);
+  http_response->set_content(file_contents);
+  return http_response.Pass();
+}
+
 }  // namespace
 
 HttpListenSocket::HttpListenSocket(const SocketDescriptor socket_descriptor,
                                    StreamListenSocket::Delegate* delegate)
     : TCPListenSocket(socket_descriptor, delegate) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void HttpListenSocket::Listen() {
   DCHECK(thread_checker_.CalledOnValidThread());
   TCPListenSocket::Listen();
 }
 
 HttpListenSocket::~HttpListenSocket() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 EmbeddedTestServer::EmbeddedTestServer(
     const scoped_refptr<base::SingleThreadTaskRunner>& io_thread)
     : io_thread_(io_thread),
       port_(-1),
       weak_factory_(this) {
   DCHECK(io_thread_);
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 EmbeddedTestServer::~EmbeddedTestServer() {
   DCHECK(thread_checker_.CalledOnValidThread());
+
+  if (Started() && !ShutdownAndWaitUntilComplete()) {
+    LOG(ERROR) << "EmbeddedTestServer failed to shut down.";
+  }
 }
 
 bool EmbeddedTestServer::InitializeAndWaitUntilReady() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   base::RunLoop run_loop;
   if (!io_thread_->PostTaskAndReply(
           FROM_HERE,
           base::Bind(&EmbeddedTestServer::InitializeOnIOThread,
                      base::Unretained(this)),
@@ skipping 77 matching lines @@
   connections_.erase(connection->socket_.get());
   delete connection;
 }
 
 GURL EmbeddedTestServer::GetURL(const std::string& relative_url) const {
   DCHECK(StartsWithASCII(relative_url, "/", true /* case_sensitive */))
       << relative_url;
   return base_url_.Resolve(relative_url);
 }
 
+bool EmbeddedTestServer::ServeFilesFromDirectory(
+    int root_key, const base::FilePath& directory) {
+  base::FilePath root_path;
+  if (!PathService::Get(root_key, &root_path))
+    return false;
+  RegisterRequestHandler(base::Bind(&HandleFileRequest,
+                                    root_path.Append(directory)));
+  return true;
+}
+
 void EmbeddedTestServer::RegisterRequestHandler(
     const HandleRequestCallback& callback) {
   request_handlers_.push_back(callback);
 }
 
 void EmbeddedTestServer::DidAccept(StreamListenSocket* server,
                            StreamListenSocket* connection) {
   DCHECK(io_thread_->BelongsToCurrentThread());
 
   HttpConnection* http_connection = new HttpConnection(
@@ skipping 35 matching lines @@
   std::map<StreamListenSocket*, HttpConnection*>::iterator it =
       connections_.find(socket);
   if (it == connections_.end()) {
     return NULL;
   }
   return it->second;
 }
 
 }  // namespace test_server
 }  // namespace net