GTTF: move chrome/browser/google_apis/test_server to net/test

net/test/embedded_test_server/http_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 "chrome/browser/google_apis/test_server/http_server.h"
+#include "net/test/embedded_test_server/http_server.h"
 
 #include "base/stringprintf.h"
 #include "base/threading/thread.h"
-#include "chrome/browser/google_apis/test_server/http_request.h"
-#include "chrome/browser/google_apis/test_server/http_response.h"
 #include "net/http/http_response_headers.h"
+#include "net/test/embedded_test_server/http_request.h"
+#include "net/test/embedded_test_server/http_response.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace google_apis {
 namespace test_server {
 
 namespace {
 
@@ skipping 40 matching lines @@
   }
 
   virtual void TearDown() OVERRIDE {
     ASSERT_TRUE(server_->ShutdownAndWaitUntilComplete());
   }
 
   // net::URLFetcherDelegate override.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE {
     ++num_responses_received_;
     if (num_responses_received_ == num_responses_expected_)
-      message_loop_.Quit();
+      MessageLoop::current()->Quit();
   }
 
   // Waits until the specified number of responses are received.
   void WaitForResponses(int num_responses) {
     num_responses_received_ = 0;
     num_responses_expected_ = num_responses;
-    message_loop_.Run();  // Will be terminated in OnURLFetchComplete().
+    // Will be terminated in OnURLFetchComplete().
+    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,
                                          const HttpRequest& request) {
     request_relative_url_ = request.relative_url;
 
     GURL absolute_url = server_->GetURL(request.relative_url);
     if (absolute_url.path() == path) {
       scoped_ptr<HttpResponse> http_response(new HttpResponse);
       http_response->set_code(code);
       http_response->set_content(content);
       http_response->set_content_type(content_type);
       return http_response.Pass();
     }
 
     return scoped_ptr<HttpResponse>();
   }
 
  protected:
   int num_responses_received_;
   int num_responses_expected_;
   std::string request_relative_url_;
   base::Thread io_thread_;
-  MessageLoop message_loop_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   scoped_ptr<HttpServer> server_;
 };
 
 TEST_F(HttpServerTest, GetBaseURL) {
   EXPECT_EQ(base::StringPrintf("http://127.0.0.1:%d/", server_->port()),
                                server_->base_url().spec());
 }
 
 TEST_F(HttpServerTest, GetURL) {
@@ skipping 95 matching lines @@
   EXPECT_EQ("text/html", GetContentTypeFromFetcher(*fetcher2));
 
   EXPECT_EQ(net::URLRequestStatus::SUCCESS, fetcher3->GetStatus().status());
   EXPECT_EQ(NOT_FOUND, fetcher3->GetResponseCode());
   EXPECT_EQ("No chocolates", GetContentFromFetcher(*fetcher3));
   EXPECT_EQ("text/plain", GetContentTypeFromFetcher(*fetcher3));
 }
 
 }  // namespace test_server
 }  // namespace google_apis