Make URLRequest's constructor private, and make URLRequestContext a friend class.

android_webview/browser/net/android_stream_reader_url_request_job_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 "android_webview/browser/input_stream.h"
 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/browser/net/input_stream_reader.h"
 #include "base/format_macros.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_byte_range.h"
 #include "net/http/http_response_headers.h"
+#include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_test_util.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using android_webview::InputStream;
 using android_webview::InputStreamReader;
 using net::TestDelegate;
 using net::TestJobInterceptor;
 using net::TestNetworkDelegate;
 using net::TestURLRequestContext;
-using net::TestURLRequest;
+using net::URLRequest;
 using testing::DoAll;
 using testing::Ge;
 using testing::Gt;
 using testing::InSequence;
 using testing::Invoke;
 using testing::InvokeWithoutArgs;
 using testing::NotNull;
 using testing::Return;
 using testing::SaveArg;
 using testing::SetArgPointee;
@@ skipping 142 matching lines @@
 };
 
 class AndroidStreamReaderURLRequestJobTest : public Test {
  public:
   AndroidStreamReaderURLRequestJobTest() {}
 
  protected:
   virtual void SetUp() {
     context_.set_job_factory(&factory_);
     context_.set_network_delegate(&network_delegate_);
-    req_.reset(new TestURLRequest(GURL("content://foo"),
+    req_ = context_.CreateRequest(GURL("content://foo"),
                                   net::DEFAULT_PRIORITY,
                                   &url_request_delegate_,
-                                  &context_));
+                                  NULL);
     req_->set_method("GET");
   }
 
   void SetRange(net::URLRequest* req, int first_byte, int last_byte) {
     net::HttpRequestHeaders headers;
     headers.SetHeader(net::HttpRequestHeaders::kRange,
                       net::HttpByteRange::Bounded(
                           first_byte, last_byte).GetHeaderValue());
     req->SetExtraRequestHeaders(headers);
   }
@@ skipping 23 matching lines @@
     protocol_handler->set_main_intercept_job(test_stream_reader_job);
     set_protocol = factory_.SetProtocolHandler("content", protocol_handler);
     DCHECK(set_protocol);
   }
 
   base::MessageLoopForIO loop_;
   TestURLRequestContext context_;
   android_webview::AwURLRequestJobFactory factory_;
   TestDelegate url_request_delegate_;
   TestNetworkDelegate network_delegate_;
-  scoped_ptr<TestURLRequest> req_;
+  scoped_ptr<URLRequest> req_;
 };
 
 TEST_F(AndroidStreamReaderURLRequestJobTest, ReadEmptyStream) {
   scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
       new StrictMock<MockInputStreamReader>());
   {
     InSequence s;
     EXPECT_CALL(*stream_reader, Seek(_))
         .WillOnce(Return(0));
     EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Gt(0)))
@@ skipping 163 matching lines @@
 
   SetRange(req_.get(), offset, bytes_available);
   req_->Start();
 
   loop.Run();
 
   EXPECT_EQ(0, network_delegate_.completed_requests());
   req_->Cancel();
   EXPECT_EQ(1, network_delegate_.completed_requests());
 }