Decouple URLRequestJob from URLRequestContext; access NetworkDelegate as a contructor parameter.

chrome/browser/captive_portal/captive_portal_browsertest.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 <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 25 matching lines @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/test/net/url_request_failed_job.h"
 #include "content/test/net/url_request_mock_http_job.h"
 #include "net/base/net_errors.h"
+#include "net/url_request/url_request_context.h"

[mmenke, 2012/06/22 20:23:43]

Let's include url_request as well, since we're now depending on it.

[shalev, 2012/06/22 20:53:55]

Done.

 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace captive_portal {
 
 namespace {
@@ skipping 97 matching lines @@
 
 // static
 void URLRequestTimeoutOnDemandJob::AbandonRequests() {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&URLRequestTimeoutOnDemandJob::AbandonRequestsOnIOThread));
 }
 
 URLRequestTimeoutOnDemandJob::URLRequestTimeoutOnDemandJob(
     net::URLRequest* request)
-    : net::URLRequestJob(request),
+    : net::URLRequestJob(request, request->context()->network_delegate()),
       next_job_(NULL) {
 }
 
 URLRequestTimeoutOnDemandJob::~URLRequestTimeoutOnDemandJob() {
   // |this| shouldn't be in the list.
   EXPECT_FALSE(RemoveFromList());
 }
 
 bool URLRequestTimeoutOnDemandJob::RemoveFromList() {
   URLRequestTimeoutOnDemandJob** job = &job_list_;
@@ skipping 1588 matching lines @@
             GetStateOfTabReloaderAt(active_browser, 0));
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE,
             GetStateOfTabReloaderAt(active_browser, 1));
   EXPECT_TRUE(IsLoginTab(active_browser->GetTabContentsAt(1)));
 
   // Simulate logging in.
   Login(active_browser, 0, 1);
 }
 
 }  // namespace captive_portal