GTTF: Move more test server code from net/url_request/url_request_unittest.h

chrome/test/ui/ppapi_uitest.cc

 // Copyright (c) 2010 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 "base/file_util.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/test/test_server.h"
 #include "webkit/glue/plugins/plugin_switches.h"
 
 namespace {
 
 // Platform-specific filename relative to the chrome executable.
 #if defined(OS_WIN)
 const wchar_t library_name[] = L"ppapi_tests.dll";
 #elif defined(OS_MACOSX)
 const char library_name[] = "ppapi_tests.plugin";
 #elif defined(OS_POSIX)
@@ skipping 44 matching lines @@
 
     GURL::Replacements replacements;
     replacements.SetQuery(test_case.c_str(),
                           url_parse::Component(0, test_case.size()));
     GURL test_url = net::FilePathToFileURL(test_path);
     RunTestURL(test_url.ReplaceComponents(replacements));
   }
 
   void RunTestViaHTTP(const std::string& test_case) {
     const wchar_t kDocRoot[] = L"third_party/ppapi/tests";
-    scoped_refptr<HTTPTestServer> server(
-        HTTPTestServer::CreateServer(kDocRoot));
+    scoped_refptr<net::HTTPTestServer> server(
+        net::HTTPTestServer::CreateServer(kDocRoot));
     ASSERT_TRUE(server);
     RunTestURL(server->TestServerPage("files/test_case.html?" + test_case));
   }
 
  private:
   void RunTestURL(const GURL& test_url) {
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_TRUE(tab.get());
     ASSERT_TRUE(tab->NavigateToURL(test_url));
     std::string escaped_value =
@@ skipping 24 matching lines @@
 }
 
 #if defined(OS_LINUX)
 // Flaky, http://crbug.com/48544.
 TEST_F(PPAPITest, FLAKY_Scrollbar) {
 #else
 TEST_F(PPAPITest, Scrollbar) {
 #endif
   RunTest("Scrollbar");
 }