Added URLRequestContext to constructor for URLRequest.

net/url_request/url_request_throttler_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/url_request/url_request_throttler_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/pickle.h"
 #include "base/stringprintf.h"
@@ skipping 149 matching lines @@
   }
   GURL url;
   std::string result;
   int line;
 };
 
 }  // namespace
 
 class URLRequestThrottlerEntryTest : public testing::Test {
  protected:
-  URLRequestThrottlerEntryTest() : request_(GURL(), NULL) {
+  URLRequestThrottlerEntryTest() : request_(GURL(), NULL, &context_) {
   }
 
   virtual void SetUp();
 
   // After calling this function, histogram snapshots in |samples_| contain
   // only the delta caused by the test case currently running.
   void CalculateHistogramDeltas();
 
   TimeTicks now_;
   MockURLRequestThrottlerManager manager_;  // Dummy object, not used.
   scoped_refptr<MockURLRequestThrottlerEntry> entry_;
 
   std::map<std::string, Histogram::SampleSet> original_samples_;
   std::map<std::string, Histogram::SampleSet> samples_;
 
+  // Order matters: context_ must be declared before request_.
+  TestURLRequestContext context_;
   TestURLRequest request_;
 };
 
 // List of all histograms we care about in these unit tests.
 const char* kHistogramNames[] = {
   "Throttling.FailureCountAtSuccess",
   "Throttling.PerceivedDowntime",
   "Throttling.RequestThrottled",
   "Throttling.SiteOptedOut",
 };
@@ skipping 176 matching lines @@
   ASSERT_FALSE(MockURLRequestThrottlerEntry::ExplicitUserRequest(0));
   ASSERT_TRUE(MockURLRequestThrottlerEntry::ExplicitUserRequest(
       LOAD_MAYBE_USER_GESTURE));
   ASSERT_FALSE(MockURLRequestThrottlerEntry::ExplicitUserRequest(
       ~LOAD_MAYBE_USER_GESTURE));
 }
 
 class URLRequestThrottlerManagerTest : public testing::Test {
  protected:
   URLRequestThrottlerManagerTest()
-      : request_(GURL(), NULL) {
+      : request_(GURL(), NULL, &context_) {
   }
 
   virtual void SetUp() {
     request_.set_load_flags(0);
   }
 
+  // context_ must be declared before request_.
+  TestURLRequestContext context_;
   TestURLRequest request_;
 };
 
 TEST_F(URLRequestThrottlerManagerTest, IsUrlStandardised) {
   MockURLRequestThrottlerManager manager;
   GurlAndString test_values[] = {
       GurlAndString(GURL("http://www.example.com"),
                     std::string("http://www.example.com/"),
                     __LINE__),
       GurlAndString(GURL("http://www.Example.com"),
@@ skipping 142 matching lines @@
         FAIL();
     }
 
     scoped_refptr<net::URLRequestThrottlerEntryInterface> entry_after =
         manager.RegisterRequestUrl(GURL("http://www.example.com/"));
     EXPECT_FALSE(entry_after->ShouldRejectRequest(request_));
   }
 }
 
 }  // namespace net