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

net/websockets/websocket_unittest.cc

 // Copyright (c) 2009 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 <vector>
 
 #include "base/callback.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/test_completion_callback.h"
 #include "net/socket/socket_test_util.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/url_request/url_request_test_util.h"
 #include "net/websockets/websocket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/platform_test.h"
 
 struct WebSocketEvent {
   enum EventType {
     EVENT_OPEN, EVENT_MESSAGE, EVENT_ERROR, EVENT_CLOSE,
   };
 
@@ skipping 320 matching lines @@
     EXPECT_EQ(1U, events.size());
 
     EXPECT_EQ(WebSocketEvent::EVENT_MESSAGE, events[0].event_type);
     EXPECT_EQ(kExpectedMsg, events[0].msg);
   }
 
   websocket->DetachDelegate();
 }
 
 }  // namespace net