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

chrome/browser/net/chrome_network_delegate_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 "chrome/browser/net/chrome_network_delegate.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_member.h"
@@ skipping 34 matching lines @@
   scoped_ptr<ChromeNetworkDelegate> CreateNetworkDelegate() {
     return make_scoped_ptr(
         new ChromeNetworkDelegate(forwarder_.get(), &pref_member_));
   }
 
   // Implementation moved here for access to private bits.
   void NeverThrottleLogicImpl() {
     scoped_ptr<ChromeNetworkDelegate> delegate(CreateNetworkDelegate());
 
     net::TestURLRequestContext context;
-    net::TestURLRequest extension_request(
-        GURL("http://example.com/"), net::DEFAULT_PRIORITY, NULL, &context);
-    extension_request.set_first_party_for_cookies(
+    scoped_ptr<net::URLRequest> extension_request(context.CreateRequest(
+        GURL("http://example.com/"), net::DEFAULT_PRIORITY, NULL, NULL));
+    extension_request->set_first_party_for_cookies(
         GURL("chrome-extension://abcdef/bingo.html"));
-    net::TestURLRequest web_page_request(
-        GURL("http://example.com/"), net::DEFAULT_PRIORITY, NULL, &context);
-    web_page_request.set_first_party_for_cookies(
+    scoped_ptr<net::URLRequest> web_page_request(context.CreateRequest(
+        GURL("http://example.com/"), net::DEFAULT_PRIORITY, NULL, NULL));
+    web_page_request->set_first_party_for_cookies(
         GURL("http://example.com/helloworld.html"));
 
-    ASSERT_TRUE(delegate->OnCanThrottleRequest(extension_request));
-    ASSERT_FALSE(delegate->OnCanThrottleRequest(web_page_request));
+    ASSERT_TRUE(delegate->OnCanThrottleRequest(*extension_request));
+    ASSERT_FALSE(delegate->OnCanThrottleRequest(*web_page_request));
 
     delegate->NeverThrottleRequests();
     ASSERT_TRUE(ChromeNetworkDelegate::g_never_throttle_requests_);
-    ASSERT_FALSE(delegate->OnCanThrottleRequest(extension_request));
-    ASSERT_FALSE(delegate->OnCanThrottleRequest(web_page_request));
+    ASSERT_FALSE(delegate->OnCanThrottleRequest(*extension_request));
+    ASSERT_FALSE(delegate->OnCanThrottleRequest(*web_page_request));
 
     // Verify that the flag applies to later instances of the
     // ChromeNetworkDelegate.
     //
     // We test the side effects of the flag rather than just the flag
     // itself (which we did above) to help ensure that a changed
     // implementation would show the same behavior, i.e. all instances
     // of ChromeNetworkDelegate after the flag is set obey the flag.
     scoped_ptr<ChromeNetworkDelegate> second_delegate(CreateNetworkDelegate());
-    ASSERT_FALSE(delegate->OnCanThrottleRequest(extension_request));
-    ASSERT_FALSE(delegate->OnCanThrottleRequest(web_page_request));
+    ASSERT_FALSE(delegate->OnCanThrottleRequest(*extension_request));
+    ASSERT_FALSE(delegate->OnCanThrottleRequest(*web_page_request));
   }
 
  private:
   bool never_throttle_requests_original_value_;
   base::MessageLoopForIO message_loop_;
 
   scoped_refptr<extensions::EventRouterForwarder> forwarder_;
   BooleanPrefMember pref_member_;
 };
 
@@ skipping 35 matching lines @@
   }
 
   // Does a request using the |url_string| URL and verifies that the expected
   // string is equal to the query part (between ? and #) of the final url of
   // that request.
   void CheckAddedParameters(const std::string& url_string,
                             const std::string& expected_query_parameters) {
     // Show the URL in the trace so we know where we failed.
     SCOPED_TRACE(url_string);
 
-    net::TestURLRequest request(
-        GURL(url_string), net::DEFAULT_PRIORITY, &delegate_, &context_);
+    scoped_ptr<net::URLRequest> request(context_.CreateRequest(
+        GURL(url_string), net::DEFAULT_PRIORITY, &delegate_, NULL));
 
-    request.Start();
+    request->Start();
     base::MessageLoop::current()->RunUntilIdle();
 
-    EXPECT_EQ(expected_query_parameters, request.url().query());
+    EXPECT_EQ(expected_query_parameters, request->url().query());
   }
 
  private:
   extensions::EventRouterForwarder* forwarder() {
 #if defined(ENABLE_EXTENSIONS)
     return forwarder_.get();
 #else
     return NULL;
 #endif
   }
@@ skipping 253 matching lines @@
 
   cookie_settings_->SetCookieSetting(
       ContentSettingsPattern::FromURL(kBlockedFirstPartySite),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTING_BLOCK);
   // Privacy mode is disabled as kAllowedSite is still getting cookies
   EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite,
                                                        kBlockedFirstPartySite));
 }