summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/proxy/init_proxy_resolver_unittest.cc12
-rw-r--r--net/proxy/proxy_script_fetcher.h2
-rw-r--r--net/proxy/proxy_script_fetcher_impl.cc34
-rw-r--r--net/proxy/proxy_script_fetcher_impl.h30
-rw-r--r--net/proxy/proxy_script_fetcher_impl_unittest.cc22
-rw-r--r--net/proxy/proxy_service_unittest.cc10
-rw-r--r--net/socket_stream/socket_stream.cc10
-rw-r--r--net/socket_stream/socket_stream.h6
-rw-r--r--net/socket_stream/socket_stream_job.h4
-rw-r--r--net/spdy/spdy_test_util.h6
-rw-r--r--net/websockets/websocket_job_unittest.cc2
11 files changed, 69 insertions, 69 deletions
diff --git a/net/proxy/init_proxy_resolver_unittest.cc b/net/proxy/init_proxy_resolver_unittest.cc
index 91097d0e..b0d416d 100644
--- a/net/proxy/init_proxy_resolver_unittest.cc
+++ b/net/proxy/init_proxy_resolver_unittest.cc
@@ -107,7 +107,7 @@ class RuleBasedProxyScriptFetcher : public ProxyScriptFetcher {
virtual void Cancel() {}
- virtual net::URLRequestContext* GetRequestContext() { return NULL; }
+ virtual URLRequestContext* GetRequestContext() { return NULL; }
private:
const Rules* rules_;
@@ -187,7 +187,7 @@ TEST(InitProxyResolverTest, CustomPacSucceeds) {
EXPECT_EQ(rule.text(), resolver.script_data()->utf16());
// Check the NetLog was filled correctly.
- net::CapturingNetLog::EntryList entries;
+ CapturingNetLog::EntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(6u, entries.size());
@@ -224,7 +224,7 @@ TEST(InitProxyResolverTest, CustomPacFails1) {
EXPECT_EQ(NULL, resolver.script_data());
// Check the NetLog was filled correctly.
- net::CapturingNetLog::EntryList entries;
+ CapturingNetLog::EntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
@@ -338,7 +338,7 @@ TEST(InitProxyResolverTest, AutodetectFailCustomSuccess2) {
// Check the NetLog was filled correctly.
// (Note that the Fetch and Set states are repeated since both WPAD and custom
// PAC scripts are tried).
- net::CapturingNetLog::EntryList entries;
+ CapturingNetLog::EntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(11u, entries.size());
@@ -453,7 +453,7 @@ TEST(InitProxyResolverTest, CustomPacFails1_WithPositiveDelay) {
EXPECT_EQ(NULL, resolver.script_data());
// Check the NetLog was filled correctly.
- net::CapturingNetLog::EntryList entries;
+ CapturingNetLog::EntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(6u, entries.size());
@@ -493,7 +493,7 @@ TEST(InitProxyResolverTest, CustomPacFails1_WithNegativeDelay) {
EXPECT_EQ(NULL, resolver.script_data());
// Check the NetLog was filled correctly.
- net::CapturingNetLog::EntryList entries;
+ CapturingNetLog::EntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
diff --git a/net/proxy/proxy_script_fetcher.h b/net/proxy/proxy_script_fetcher.h
index e42d979..9829316 100644
--- a/net/proxy/proxy_script_fetcher.h
+++ b/net/proxy/proxy_script_fetcher.h
@@ -49,7 +49,7 @@ class ProxyScriptFetcher {
// Returns the request context that this fetcher uses to issue downloads,
// or NULL.
- virtual net::URLRequestContext* GetRequestContext() = 0;
+ virtual URLRequestContext* GetRequestContext() = 0;
};
} // namespace net
diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc
index 0724127..7d22ed3 100644
--- a/net/proxy/proxy_script_fetcher_impl.cc
+++ b/net/proxy/proxy_script_fetcher_impl.cc
@@ -70,10 +70,10 @@ void ConvertResponseToUTF16(const std::string& charset,
} // namespace
ProxyScriptFetcherImpl::ProxyScriptFetcherImpl(
- net::URLRequestContext* url_request_context)
+ URLRequestContext* url_request_context)
: ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
url_request_context_(url_request_context),
- buf_(new net::IOBuffer(kBufSize)),
+ buf_(new IOBuffer(kBufSize)),
next_id_(0),
cur_request_(NULL),
cur_request_id_(0),
@@ -86,7 +86,7 @@ ProxyScriptFetcherImpl::ProxyScriptFetcherImpl(
}
ProxyScriptFetcherImpl::~ProxyScriptFetcherImpl() {
- // The net::URLRequest's destructor will cancel the outstanding request, and
+ // The URLRequest's destructor will cancel the outstanding request, and
// ensure that the delegate (this) is not called again.
}
@@ -99,7 +99,7 @@ int ProxyScriptFetcherImpl::Fetch(const GURL& url,
DCHECK(callback);
DCHECK(text);
- cur_request_.reset(new net::URLRequest(url, this));
+ cur_request_.reset(new URLRequest(url, this));
cur_request_->set_context(url_request_context_);
cur_request_->set_method("GET");
@@ -129,16 +129,16 @@ int ProxyScriptFetcherImpl::Fetch(const GURL& url,
}
void ProxyScriptFetcherImpl::Cancel() {
- // ResetCurRequestState will free the net::URLRequest, which will cause
+ // ResetCurRequestState will free the URLRequest, which will cause
// cancellation.
ResetCurRequestState();
}
-net::URLRequestContext* ProxyScriptFetcherImpl::GetRequestContext() {
+URLRequestContext* ProxyScriptFetcherImpl::GetRequestContext() {
return url_request_context_;
}
-void ProxyScriptFetcherImpl::OnAuthRequired(net::URLRequest* request,
+void ProxyScriptFetcherImpl::OnAuthRequired(URLRequest* request,
AuthChallengeInfo* auth_info) {
DCHECK_EQ(request, cur_request_.get());
// TODO(eroman):
@@ -147,7 +147,7 @@ void ProxyScriptFetcherImpl::OnAuthRequired(net::URLRequest* request,
request->CancelAuth();
}
-void ProxyScriptFetcherImpl::OnSSLCertificateError(net::URLRequest* request,
+void ProxyScriptFetcherImpl::OnSSLCertificateError(URLRequest* request,
int cert_error,
X509Certificate* cert) {
DCHECK_EQ(request, cur_request_.get());
@@ -157,7 +157,7 @@ void ProxyScriptFetcherImpl::OnSSLCertificateError(net::URLRequest* request,
request->Cancel();
}
-void ProxyScriptFetcherImpl::OnResponseStarted(net::URLRequest* request) {
+void ProxyScriptFetcherImpl::OnResponseStarted(URLRequest* request) {
DCHECK_EQ(request, cur_request_.get());
if (!request->status().is_success()) {
@@ -191,7 +191,7 @@ void ProxyScriptFetcherImpl::OnResponseStarted(net::URLRequest* request) {
ReadBody(request);
}
-void ProxyScriptFetcherImpl::OnReadCompleted(net::URLRequest* request,
+void ProxyScriptFetcherImpl::OnReadCompleted(URLRequest* request,
int num_bytes) {
DCHECK_EQ(request, cur_request_.get());
if (ConsumeBytesRead(request, num_bytes)) {
@@ -200,7 +200,7 @@ void ProxyScriptFetcherImpl::OnReadCompleted(net::URLRequest* request,
}
}
-void ProxyScriptFetcherImpl::OnResponseCompleted(net::URLRequest* request) {
+void ProxyScriptFetcherImpl::OnResponseCompleted(URLRequest* request) {
DCHECK_EQ(request, cur_request_.get());
// Use |result_code_| as the request's error if we have already set it to
@@ -211,7 +211,7 @@ void ProxyScriptFetcherImpl::OnResponseCompleted(net::URLRequest* request) {
FetchCompleted();
}
-void ProxyScriptFetcherImpl::ReadBody(net::URLRequest* request) {
+void ProxyScriptFetcherImpl::ReadBody(URLRequest* request) {
// Read as many bytes as are available synchronously.
while (true) {
int num_bytes;
@@ -226,7 +226,7 @@ void ProxyScriptFetcherImpl::ReadBody(net::URLRequest* request) {
}
}
-bool ProxyScriptFetcherImpl::ConsumeBytesRead(net::URLRequest* request,
+bool ProxyScriptFetcherImpl::ConsumeBytesRead(URLRequest* request,
int num_bytes) {
if (num_bytes <= 0) {
// Error while reading, or EOF.
@@ -260,9 +260,9 @@ void ProxyScriptFetcherImpl::FetchCompleted() {
int result_code = result_code_;
CompletionCallback* callback = callback_;
- // Hold a reference to the net::URLRequestContext to prevent re-entrancy from
- // ~net::URLRequestContext.
- scoped_refptr<net::URLRequestContext> context(cur_request_->context());
+ // Hold a reference to the URLRequestContext to prevent re-entrancy from
+ // ~URLRequestContext.
+ scoped_refptr<URLRequestContext> context(cur_request_->context());
ResetCurRequestState();
callback->Run(result_code);
@@ -277,7 +277,7 @@ void ProxyScriptFetcherImpl::ResetCurRequestState() {
}
void ProxyScriptFetcherImpl::OnTimeout(int id) {
- // Timeout tasks may outlive the net::URLRequest they reference. Make sure it
+ // Timeout tasks may outlive the URLRequest they reference. Make sure it
// is still applicable.
if (cur_request_id_ != id)
return;
diff --git a/net/proxy/proxy_script_fetcher_impl.h b/net/proxy/proxy_script_fetcher_impl.h
index 2dc0335..65c16f7 100644
--- a/net/proxy/proxy_script_fetcher_impl.h
+++ b/net/proxy/proxy_script_fetcher_impl.h
@@ -25,7 +25,7 @@ class URLRequestContext;
// Implementation of ProxyScriptFetcher that downloads scripts using the
// specified request context.
class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
- public net::URLRequest::Delegate {
+ public URLRequest::Delegate {
public:
// Creates a ProxyScriptFetcher that issues requests through
// |url_request_context|. |url_request_context| must remain valid for the
@@ -33,7 +33,7 @@ class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
// Note that while a request is in progress, we will be holding a reference
// to |url_request_context|. Be careful not to create cycles between the
// fetcher and the context; you can break such cycles by calling Cancel().
- explicit ProxyScriptFetcherImpl(net::URLRequestContext* url_request_context);
+ explicit ProxyScriptFetcherImpl(URLRequestContext* url_request_context);
virtual ~ProxyScriptFetcherImpl();
@@ -42,16 +42,16 @@ class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
virtual int Fetch(const GURL& url, string16* text,
CompletionCallback* callback);
virtual void Cancel();
- virtual net::URLRequestContext* GetRequestContext();
+ virtual URLRequestContext* GetRequestContext();
- // net::URLRequest::Delegate methods:
- virtual void OnAuthRequired(net::URLRequest* request,
+ // URLRequest::Delegate methods:
+ virtual void OnAuthRequired(URLRequest* request,
AuthChallengeInfo* auth_info);
- virtual void OnSSLCertificateError(net::URLRequest* request, int cert_error,
+ virtual void OnSSLCertificateError(URLRequest* request, int cert_error,
X509Certificate* cert);
- virtual void OnResponseStarted(net::URLRequest* request);
- virtual void OnReadCompleted(net::URLRequest* request, int num_bytes);
- virtual void OnResponseCompleted(net::URLRequest* request);
+ virtual void OnResponseStarted(URLRequest* request);
+ virtual void OnReadCompleted(URLRequest* request, int num_bytes);
+ virtual void OnResponseCompleted(URLRequest* request);
// Used by unit-tests to modify the default limits.
base::TimeDelta SetTimeoutConstraint(base::TimeDelta timeout);
@@ -59,11 +59,11 @@ class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
private:
// Read more bytes from the response.
- void ReadBody(net::URLRequest* request);
+ void ReadBody(URLRequest* request);
// Handles a response from Read(). Returns true if we should continue trying
// to read. |num_bytes| is 0 for EOF, and < 0 on errors.
- bool ConsumeBytesRead(net::URLRequest* request, int num_bytes);
+ bool ConsumeBytesRead(URLRequest* request, int num_bytes);
// Called once the request has completed to notify the caller of
// |response_code_| and |response_text_|.
@@ -80,17 +80,17 @@ class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
ScopedRunnableMethodFactory<ProxyScriptFetcherImpl> task_factory_;
// The context used for making network requests.
- net::URLRequestContext* url_request_context_;
+ URLRequestContext* url_request_context_;
- // Buffer that net::URLRequest writes into.
+ // Buffer that URLRequest writes into.
enum { kBufSize = 4096 };
- scoped_refptr<net::IOBuffer> buf_;
+ scoped_refptr<IOBuffer> buf_;
// The next ID to use for |cur_request_| (monotonically increasing).
int next_id_;
// The current (in progress) request, or NULL.
- scoped_ptr<net::URLRequest> cur_request_;
+ scoped_ptr<URLRequest> cur_request_;
// State for current request (only valid when |cur_request_| is not NULL):
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index 84b822c..3e068a6 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -76,19 +76,19 @@ GURL GetTestFileUrl(const std::string& relpath) {
class ProxyScriptFetcherImplTest : public PlatformTest {
public:
ProxyScriptFetcherImplTest()
- : test_server_(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)) {
+ : test_server_(TestServer::TYPE_HTTP, FilePath(kDocRoot)) {
}
static void SetUpTestCase() {
- net::URLRequest::AllowFileAccess();
+ URLRequest::AllowFileAccess();
}
protected:
- net::TestServer test_server_;
+ TestServer test_server_;
};
TEST_F(ProxyScriptFetcherImplTest, FileUrl) {
- scoped_refptr<net::URLRequestContext> context(new RequestContext);
+ scoped_refptr<URLRequestContext> context(new RequestContext);
ProxyScriptFetcherImpl pac_fetcher(context);
{ // Fetch a non-existent file.
@@ -116,7 +116,7 @@ TEST_F(ProxyScriptFetcherImplTest, FileUrl) {
TEST_F(ProxyScriptFetcherImplTest, HttpMimeType) {
ASSERT_TRUE(test_server_.Start());
- scoped_refptr<net::URLRequestContext> context(new RequestContext);
+ scoped_refptr<URLRequestContext> context(new RequestContext);
ProxyScriptFetcherImpl pac_fetcher(context);
{ // Fetch a PAC with mime type "text/plain"
@@ -151,7 +151,7 @@ TEST_F(ProxyScriptFetcherImplTest, HttpMimeType) {
TEST_F(ProxyScriptFetcherImplTest, HttpStatusCode) {
ASSERT_TRUE(test_server_.Start());
- scoped_refptr<net::URLRequestContext> context(new RequestContext);
+ scoped_refptr<URLRequestContext> context(new RequestContext);
ProxyScriptFetcherImpl pac_fetcher(context);
{ // Fetch a PAC which gives a 500 -- FAIL
@@ -177,7 +177,7 @@ TEST_F(ProxyScriptFetcherImplTest, HttpStatusCode) {
TEST_F(ProxyScriptFetcherImplTest, ContentDisposition) {
ASSERT_TRUE(test_server_.Start());
- scoped_refptr<net::URLRequestContext> context(new RequestContext);
+ scoped_refptr<URLRequestContext> context(new RequestContext);
ProxyScriptFetcherImpl pac_fetcher(context);
// Fetch PAC scripts via HTTP with a Content-Disposition header -- should
@@ -194,7 +194,7 @@ TEST_F(ProxyScriptFetcherImplTest, ContentDisposition) {
TEST_F(ProxyScriptFetcherImplTest, NoCache) {
ASSERT_TRUE(test_server_.Start());
- scoped_refptr<net::URLRequestContext> context(new RequestContext);
+ scoped_refptr<URLRequestContext> context(new RequestContext);
ProxyScriptFetcherImpl pac_fetcher(context);
// Fetch a PAC script whose HTTP headers make it cacheable for 1 hour.
@@ -226,7 +226,7 @@ TEST_F(ProxyScriptFetcherImplTest, NoCache) {
TEST_F(ProxyScriptFetcherImplTest, TooLarge) {
ASSERT_TRUE(test_server_.Start());
- scoped_refptr<net::URLRequestContext> context(new RequestContext);
+ scoped_refptr<URLRequestContext> context(new RequestContext);
ProxyScriptFetcherImpl pac_fetcher(context);
// Set the maximum response size to 50 bytes.
@@ -267,7 +267,7 @@ TEST_F(ProxyScriptFetcherImplTest, TooLarge) {
TEST_F(ProxyScriptFetcherImplTest, Hang) {
ASSERT_TRUE(test_server_.Start());
- scoped_refptr<net::URLRequestContext> context(new RequestContext);
+ scoped_refptr<URLRequestContext> context(new RequestContext);
ProxyScriptFetcherImpl pac_fetcher(context);
// Set the timeout period to 0.5 seconds.
@@ -305,7 +305,7 @@ TEST_F(ProxyScriptFetcherImplTest, Hang) {
TEST_F(ProxyScriptFetcherImplTest, Encodings) {
ASSERT_TRUE(test_server_.Start());
- scoped_refptr<net::URLRequestContext> context(new RequestContext);
+ scoped_refptr<URLRequestContext> context(new RequestContext);
ProxyScriptFetcherImpl pac_fetcher(context);
// Test a response that is gzip-encoded -- should get inflated.
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index aefd5a3..95f8bbc 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -98,7 +98,7 @@ class MockProxyScriptFetcher : public ProxyScriptFetcher {
virtual void Cancel() {}
- virtual net::URLRequestContext* GetRequestContext() { return NULL; }
+ virtual URLRequestContext* GetRequestContext() { return NULL; }
const GURL& pending_request_url() const {
return pending_request_url_;
@@ -132,7 +132,7 @@ TEST(ProxyServiceTest, Direct) {
EXPECT_TRUE(info.is_direct());
// Check the NetLog was filled correctly.
- net::CapturingNetLog::EntryList entries;
+ CapturingNetLog::EntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(3u, entries.size());
@@ -179,7 +179,7 @@ TEST(ProxyServiceTest, PAC) {
EXPECT_EQ("foopy:80", info.proxy_server().ToURI());
// Check the NetLog was filled correctly.
- net::CapturingNetLog::EntryList entries;
+ CapturingNetLog::EntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(5u, entries.size());
@@ -1157,7 +1157,7 @@ TEST(ProxyServiceTest, CancelWhilePACFetching) {
EXPECT_FALSE(callback1.have_result()); // Cancelled.
EXPECT_FALSE(callback2.have_result()); // Cancelled.
- net::CapturingNetLog::EntryList entries1;
+ CapturingNetLog::EntryList entries1;
log1.GetEntries(&entries1);
// Check the NetLog for request 1 (which was cancelled) got filled properly.
@@ -1690,7 +1690,7 @@ TEST(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
// In particular, PROXY_CONFIG_CHANGED should have only been emitted once
// (for the initial setup), and NOT a second time when the IP address
// changed.
- net::CapturingNetLog::EntryList entries;
+ CapturingNetLog::EntryList entries;
log.GetEntries(&entries);
EXPECT_TRUE(LogContainsEntryWithType(entries, 0,
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index be402c6..e3dc817 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -96,8 +96,8 @@ void SocketStream::SetUserData(const void* key, UserData* data) {
user_data_[key] = linked_ptr<UserData>(data);
}
-void SocketStream::set_context(net::URLRequestContext* context) {
- scoped_refptr<net::URLRequestContext> prev_context = context_;
+void SocketStream::set_context(URLRequestContext* context) {
+ scoped_refptr<URLRequestContext> prev_context = context_;
context_ = context;
@@ -264,7 +264,7 @@ void SocketStream::Finish(int result) {
if (result == OK)
result = ERR_CONNECTION_CLOSED;
DCHECK_EQ(next_state_, STATE_NONE);
- DVLOG(1) << "Finish result=" << net::ErrorToString(result);
+ DVLOG(1) << "Finish result=" << ErrorToString(result);
if (delegate_)
delegate_->OnError(this, result);
@@ -535,7 +535,7 @@ int SocketStream::DoResolveHostComplete(int result) {
if (result == OK && delegate_) {
next_state_ = STATE_TCP_CONNECT;
result = delegate_->OnStartOpenConnection(this, &io_callback_);
- if (result == net::ERR_IO_PENDING)
+ if (result == ERR_IO_PENDING)
metrics_->OnWaitConnection();
} else {
next_state_ = STATE_CLOSE;
@@ -986,7 +986,7 @@ void SocketStream::DoAuthRequired() {
if (delegate_ && auth_info_.get())
delegate_->OnAuthRequired(this, auth_info_.get());
else
- DoLoop(net::ERR_UNEXPECTED);
+ DoLoop(ERR_UNEXPECTED);
}
void SocketStream::DoRestartWithAuth() {
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index 7288dec..7b7599e 100644
--- a/net/socket_stream/socket_stream.h
+++ b/net/socket_stream/socket_stream.h
@@ -112,8 +112,8 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
Delegate* delegate() const { return delegate_; }
int max_pending_send_allowed() const { return max_pending_send_allowed_; }
- net::URLRequestContext* context() const { return context_.get(); }
- void set_context(net::URLRequestContext* context);
+ URLRequestContext* context() const { return context_.get(); }
+ void set_context(URLRequestContext* context);
BoundNetLog* net_log() { return &net_log_; }
@@ -271,7 +271,7 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
GURL url_;
int max_pending_send_allowed_;
- scoped_refptr<net::URLRequestContext> context_;
+ scoped_refptr<URLRequestContext> context_;
UserDataMap user_data_;
diff --git a/net/socket_stream/socket_stream_job.h b/net/socket_stream/socket_stream_job.h
index 6253499..973c20a 100644
--- a/net/socket_stream/socket_stream_job.h
+++ b/net/socket_stream/socket_stream_job.h
@@ -42,10 +42,10 @@ class SocketStreamJob : public base::RefCountedThreadSafe<SocketStreamJob> {
virtual SocketStream::UserData* GetUserData(const void* key) const;
virtual void SetUserData(const void* key, SocketStream::UserData* data);
- net::URLRequestContext* context() const {
+ URLRequestContext* context() const {
return socket_->context();
}
- void set_context(net::URLRequestContext* context) {
+ void set_context(URLRequestContext* context) {
socket_->set_context(context);
}
diff --git a/net/spdy/spdy_test_util.h b/net/spdy/spdy_test_util.h
index 96ce5de..698d511 100644
--- a/net/spdy/spdy_test_util.h
+++ b/net/spdy/spdy_test_util.h
@@ -397,7 +397,7 @@ class SpdySessionDependencies {
}
};
-class SpdyURLRequestContext : public net::URLRequestContext {
+class SpdyURLRequestContext : public URLRequestContext {
public:
SpdyURLRequestContext() {
host_resolver_ = new MockHostResolver();
@@ -406,7 +406,7 @@ class SpdyURLRequestContext : public net::URLRequestContext {
ssl_config_service_ = new SSLConfigServiceDefaults;
http_auth_handler_factory_ = HttpAuthHandlerFactory::CreateDefault(
host_resolver_);
- http_transaction_factory_ = new net::HttpCache(
+ http_transaction_factory_ = new HttpCache(
new HttpNetworkLayer(&socket_factory_,
host_resolver_,
cert_verifier_,
@@ -420,7 +420,7 @@ class SpdyURLRequestContext : public net::URLRequestContext {
network_delegate_,
NULL),
NULL /* net_log */,
- net::HttpCache::DefaultBackend::InMemory(0));
+ HttpCache::DefaultBackend::InMemory(0));
}
MockClientSocketFactory& socket_factory() { return socket_factory_; }
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc
index a0ff609..2133cfa 100644
--- a/net/websockets/websocket_job_unittest.cc
+++ b/net/websockets/websocket_job_unittest.cc
@@ -177,7 +177,7 @@ class MockCookiePolicy : public CookiePolicy,
CompletionCallback* callback_;
};
-class MockURLRequestContext : public net::URLRequestContext {
+class MockURLRequestContext : public URLRequestContext {
public:
MockURLRequestContext(CookieStore* cookie_store,
CookiePolicy* cookie_policy) {
generated by cgit v1.1 at 2025-01-30 14:26:54 +0000