JobController 2: Remove reference between HttpStreamFactoryImpl::Jobs.

net/http/http_stream_factory_impl_request_unittest.cc

 // Copyright (c) 2013 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/http/http_stream_factory_impl_request.h"
 
 #include <memory>
 
 #include "net/http/http_stream_factory_impl_job.h"
 #include "net/http/http_stream_factory_impl_job_controller.h"
@@ skipping 74 matching lines @@
       GURL(), job_controller, &request_delegate, NULL, BoundNetLog(),
       HttpStreamFactoryImpl::Request::HTTP_STREAM);
   job_controller->request_ = &request;
 
   HttpRequestInfo request_info;
 
   HostPortPair server = HostPortPair::FromURL(request_info.url);
   GURL original_url = factory->ApplyHostMappingRules(request_info.url, &server);
 
   HttpStreamFactoryImpl::Job* job = new HttpStreamFactoryImpl::Job(
-      job_controller, session.get(), request_info, DEFAULT_PRIORITY,
-      SSLConfig(), SSLConfig(), server, original_url, NULL);
+      job_controller, HttpStreamFactoryImpl::NON_ALTERNATIVE, session.get(),
+      request_info, DEFAULT_PRIORITY, SSLConfig(), SSLConfig(), server,
+      original_url, NULL);
   job_controller->AttachJob(job);
+  job_controller->main_job_ = job;
+
   EXPECT_EQ(DEFAULT_PRIORITY, job->priority());
 
   request.SetPriority(MEDIUM);
   EXPECT_EQ(MEDIUM, job->priority());
 
   // Make |job| the bound job.
   job_controller->OnStreamFailed(job, ERR_FAILED, SSLConfig(),
                                  SSL_FAILURE_NONE);
   request.SetPriority(IDLE);
   EXPECT_EQ(IDLE, job->priority());
@@ skipping 23 matching lines @@
 
   HttpStreamFactoryImpl::Request request(
       request_info.url, job_controller, &request_delegate, NULL, BoundNetLog(),
       HttpStreamFactoryImpl::Request::HTTP_STREAM);
   job_controller->request_ = &request;
 
   HostPortPair server = HostPortPair::FromURL(request_info.url);
   GURL original_url = factory->ApplyHostMappingRules(request_info.url, &server);
 
   HttpStreamFactoryImpl::Job* job = new HttpStreamFactoryImpl::Job(
-      job_controller, session.get(), request_info, DEFAULT_PRIORITY,
-      SSLConfig(), SSLConfig(), server, original_url, NULL);
+      job_controller, HttpStreamFactoryImpl::NON_ALTERNATIVE, session.get(),
+      request_info, DEFAULT_PRIORITY, SSLConfig(), SSLConfig(), server,
+      original_url, NULL);
   job_controller->AttachJob(job);
+  job_controller->main_job_ = job;
+
   EXPECT_EQ(DEFAULT_PRIORITY, job->priority());
 
   AlternativeService alternative_service(net::NPN_HTTP_2, server);
   HttpStreamFactoryImpl::Job* alternative_job = new HttpStreamFactoryImpl::Job(
-      job_controller, session.get(), request_info, DEFAULT_PRIORITY,
-      SSLConfig(), SSLConfig(), server, original_url, alternative_service,
-      NULL);
+      job_controller, HttpStreamFactoryImpl::ALTERNATIVE, session.get(),
+      request_info, DEFAULT_PRIORITY, SSLConfig(), SSLConfig(), server,
+      original_url, alternative_service, NULL);
   job_controller->AttachJob(alternative_job);
+  job_controller->alternative_job_ = alternative_job;
 
-  job->WaitFor(alternative_job);
+  job_controller->racing_ = true;
   EXPECT_EQ(HttpStreamFactoryImpl::Job::STATE_NONE, job->next_state_);
 
   // Test |alternative_job| resuming the |job| after delay.
   int wait_time = 1;
   base::TimeDelta delay = base::TimeDelta::FromMilliseconds(wait_time);
-  job->Resume(alternative_job, delay);
+  job_controller->MaybeResumeOtherJob(alternative_job, delay);
 
-  // Verify |job| has |wait_time_| and there is no |blocking_job_|
+  // Verify |job| has |wait_time_| and there is no blocking job.
   EXPECT_EQ(delay, job->wait_time_);
-  EXPECT_TRUE(!job->blocking_job_);
+  EXPECT_TRUE(!job_controller->racing());
 
   // Start the |job| and verify |job|'s |wait_time_| is cleared.
   job->Start(&request);
 
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(wait_time + 1));
   base::MessageLoop::current()->RunUntilIdle();
 
   EXPECT_NE(delay, job->wait_time_);
   EXPECT_TRUE(job->wait_time_.is_zero());
   EXPECT_EQ(HttpStreamFactoryImpl::Job::STATE_INIT_CONNECTION_COMPLETE,
             job->next_state_);
 }
 
 }  // namespace net