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

chrome/test/automation/automation_proxy_uitest.cc

 // Copyright (c) 2006-2008 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 <string>
 
 #include "app/app_switches.h"
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 12 matching lines @@
 #include "chrome/test/automation/autocomplete_edit_proxy.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/automation_proxy_uitest.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui_test_utils.h"
 #include "chrome/test/ui/ui_test.h"
 #include "gfx/rect.h"
 #include "net/base/net_util.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/test/test_server.h"
 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
 #include "testing/gmock_mutant.h"
 #include "views/event.h"
 
 using ui_test_utils::TimedMessageLoopRunner;
 using testing::CreateFunctor;
 using testing::StrEq;
 using testing::_;
 
 class AutomationProxyTest : public UITest {
@@ skipping 920 matching lines @@
           QUIT_LOOP_SOON(&loop, 50)));
 
   EXPECT_CALL(*mock_, HandleClosed(1)).Times(1);
 
   tab = mock_->CreateTabWithUrl(GURL(content));
   loop.RunFor(action_max_timeout_ms());
 }
 
 TEST_F(ExternalTabUITest, FLAKY_PostMessageTarget)  {
   const wchar_t kDocRoot[] = L"chrome/test/data/external_tab";
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_THAT(server.get(), testing::NotNull());
 
   scoped_refptr<TabProxy> tab;
   TimedMessageLoopRunner loop(MessageLoop::current());
   ASSERT_THAT(mock_, testing::NotNull());
   EXPECT_CALL(*mock_, OnNavigationStateChanged(_, _, _))
       .Times(testing::AnyNumber());
   EXPECT_CALL(*mock_, OnLoad(_, _)).Times(testing::AnyNumber());
 
   std::string kTestMessage("Hello from gtest");
@@ skipping 503 matching lines @@
 
   // Allow some time for the popup to show up and close.
   PlatformThread::Sleep(sleep_timeout_ms());
 
   std::wstring expected(L"string");
   std::wstring jscript = CreateJSString(L"\"" + expected + L"\"");
   std::wstring actual;
   ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual));
   ASSERT_EQ(expected, actual);
 }