Move SpawnedTestServer to its own subdirectory.

chrome/browser/history/redirect_browsertest.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.
 
 // Navigates the browser to server and client redirect pages and makes sure
 // that the correct redirects are reflected in the history database. Errors
 // here might indicate that WebKit changed the calls our glue layer gets in
 // the case of redirects. It may also mean problems with the history system.
 
 #include "base/bind.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "net/base/net_util.h"
-#include "net/test/spawned_test_server.h"
+#include "net/test/spawned_test_server/spawned_test_server.h"
 #include "ui/base/events/event_constants.h"
 
 class RedirectTest : public InProcessBrowserTest {
  public:
   RedirectTest() {}
 
   std::vector<GURL> GetRedirects(const GURL& url) {
     HistoryService* history_service =
         HistoryServiceFactory::GetForProfile(browser()->profile(),
                                              Profile::EXPLICIT_ACCESS);
@@ skipping 261 matching lines @@
   // as a client redirect from the first (/client-redirect?) page.
   for (std::vector<GURL>::iterator it = redirects.begin();
        it != redirects.end(); ++it) {
     if (final_url.spec() == it->spec()) {
       final_navigation_not_redirect = false;
       break;
     }
   }
   EXPECT_TRUE(final_navigation_not_redirect);
 }