Move url_request_test_util into net namespace

net/socket_stream/socket_stream_unittest.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.
 
 #include "net/socket_stream/socket_stream.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 161 matching lines @@
   base::Callback<void(SocketStreamEvent*)> on_close_;
   base::Callback<void(SocketStreamEvent*)> on_auth_required_;
   base::Callback<void(SocketStreamEvent*)> on_error_;
   const net::CompletionCallback callback_;
   net::CompletionCallback connection_callback_;
   net::AuthCredentials credentials_;
 
   DISALLOW_COPY_AND_ASSIGN(SocketStreamEventRecorder);
 };
 
-class TestURLRequestContextWithProxy : public TestURLRequestContext {
+class TestURLRequestContextWithProxy : public net::TestURLRequestContext {
  public:
   explicit TestURLRequestContextWithProxy(const std::string& proxy)
       : TestURLRequestContext(true) {
     context_storage_.set_proxy_service(net::ProxyService::CreateFixed(proxy));
     Init();
   }
   virtual ~TestURLRequestContextWithProxy() {}
 };
 
-class TestSocketStreamNetworkDelegate : public TestNetworkDelegate {
+class TestSocketStreamNetworkDelegate : public net::TestNetworkDelegate {
  public:
   TestSocketStreamNetworkDelegate()
       : before_connect_result_(net::OK) {}
   virtual ~TestSocketStreamNetworkDelegate() {}
 
   virtual int OnBeforeSocketStreamConnect(
       net::SocketStream* stream,
       const net::CompletionCallback& callback) OVERRIDE {
     return before_connect_result_;
   }
 
   void SetBeforeConnectResult(int result) {
     before_connect_result_ = result;
   }
 
  private:
   int before_connect_result_;
 };
 
 }  // namespace
 
 namespace net {

[wtc, 2012/11/12 21:50:49]

We can also consider putting this whole file inside namespace
net.

Your change is fine by me though.

[jochen (gone - plz use gerrit), 2012/11/13 09:17:57]

Done.

 
 class SocketStreamTest : public PlatformTest {
  public:
   virtual ~SocketStreamTest() {}
   virtual void SetUp() {
     mock_socket_factory_.reset();
     handshake_request_ = kWebSocketHandshakeRequest;
     handshake_response_ = kWebSocketHandshakeResponse;
   }
   virtual void TearDown() {
@@ skipping 575 matching lines @@
 
   const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
   ASSERT_EQ(2U, events.size());
 
   EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[0].event_type);
   EXPECT_EQ(net::ERR_ACCESS_DENIED, events[0].error_code);
   EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[1].event_type);
 }
 
 }  // namespace net