Reapply r72562 with willchan's nits + locally tested shlib fixes.

chrome_frame/test/test_server_test.cc

 // Copyright (c) 2011 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 <windows.h>
 #include <wininet.h>
 
 #include "base/basictypes.h"
 #include "base/path_service.h"
 #include "base/win/scoped_handle.h"
 #include "chrome_frame/test/test_server.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/host_resolver_proc.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TestServerTest: public testing::Test {
  protected:
   virtual void SetUp() {
     PathService::Get(base::DIR_SOURCE_ROOT, &source_path_);
     source_path_ = source_path_.Append(FILE_PATH_LITERAL("chrome_frame"));
   }
   virtual void TearDown() {
   }
@@ skipping 174 matching lines @@
     EXPECT_EQ(file.accessed(), 1);
     EXPECT_EQ(redir.accessed(), 1);
 
     EXPECT_TRUE(person_task.response().find("Guthrie") != std::string::npos);
     EXPECT_TRUE(file_task.response().find("function") != std::string::npos);
     EXPECT_TRUE(goog_task.response().find("<title>") != std::string::npos);
   } else {
     ::TerminateThread(worker, ~0);
   }
 }