Revert 218616 "[net/dns] Perform A/AAAA queries for AF_UNSPEC re..."

trunk/src/net/base/prioritized_dispatcher_unittest.cc

Index: trunk/src/net/base/prioritized_dispatcher_unittest.cc
===================================================================
--- trunk/src/net/base/prioritized_dispatcher_unittest.cc	(revision 219026)
+++ trunk/src/net/base/prioritized_dispatcher_unittest.cc	(working copy)
@@ -52,17 +52,13 @@
       return handle_;
     }
 
-    void Add(bool at_head) {
+    void Add() {
       CHECK(handle_.is_null());
       CHECK(!running_);
       size_t num_queued = dispatcher_->num_queued_jobs();
       size_t num_running = dispatcher_->num_running_jobs();
 
-      if (!at_head) {
-        handle_ = dispatcher_->Add(this, priority_);
-      } else {
-        handle_ = dispatcher_->AddAtHead(this, priority_);
-      }
+      handle_ = dispatcher_->Add(this, priority_);
 
       if (handle_.is_null()) {
         EXPECT_EQ(num_queued, dispatcher_->num_queued_jobs());
@@ -144,17 +140,10 @@
   TestJob* AddJob(char data, Priority priority) {
     TestJob* job = new TestJob(dispatcher_.get(), data, priority, &log_);
     jobs_.push_back(job);
-    job->Add(false);
+    job->Add();
     return job;
   }
 
-  TestJob* AddJobAtHead(char data, Priority priority) {
-    TestJob* job = new TestJob(dispatcher_.get(), data, priority, &log_);
-    jobs_.push_back(job);
-    job->Add(true);
-    return job;
-  }
-
   void Expect(std::string log) {
     EXPECT_EQ(0u, dispatcher_->num_queued_jobs());
     EXPECT_EQ(0u, dispatcher_->num_running_jobs());
@@ -213,33 +202,6 @@
   Expect("a.c.d.b.e.");
 }
 
-TEST_F(PrioritizedDispatcherTest, AddAtHead) {
-  PrioritizedDispatcher::Limits limits(NUM_PRIORITIES, 1);
-  Prepare(limits);
-
-  TestJob* job_a = AddJob('a', MEDIUM);
-  TestJob* job_b = AddJobAtHead('b', MEDIUM);
-  TestJob* job_c = AddJobAtHead('c', HIGHEST);
-  TestJob* job_d = AddJobAtHead('d', HIGHEST);
-  TestJob* job_e = AddJobAtHead('e', MEDIUM);
-  TestJob* job_f = AddJob('f', MEDIUM);
-
-  ASSERT_TRUE(job_a->running());
-  job_a->Finish();
-  ASSERT_TRUE(job_d->running());
-  job_d->Finish();
-  ASSERT_TRUE(job_c->running());
-  job_c->Finish();
-  ASSERT_TRUE(job_e->running());
-  job_e->Finish();
-  ASSERT_TRUE(job_b->running());
-  job_b->Finish();
-  ASSERT_TRUE(job_f->running());
-  job_f->Finish();
-
-  Expect("a.d.c.e.b.f.");
-}
-
 TEST_F(PrioritizedDispatcherTest, EnforceLimits) {
   // Reserve 2 for HIGHEST and 1 for LOW or higher.
   // This leaves 2 for LOWEST or lower.
@@ -283,40 +245,29 @@
 }
 
 TEST_F(PrioritizedDispatcherTest, ChangePriority) {
-  PrioritizedDispatcher::Limits limits(NUM_PRIORITIES, 2);
-  // Reserve one slot only for HIGHEST priority requests.
-  limits.reserved_slots[HIGHEST] = 1;
+  PrioritizedDispatcher::Limits limits(NUM_PRIORITIES, 1);
   Prepare(limits);
 
   TestJob* job_a = AddJob('a', IDLE);
-  TestJob* job_b = AddJob('b', LOW);
-  TestJob* job_c = AddJob('c', MEDIUM);
-  TestJob* job_d = AddJob('d', MEDIUM);
-  TestJob* job_e = AddJob('e', IDLE);
+  TestJob* job_b = AddJob('b', MEDIUM);
+  TestJob* job_c = AddJob('c', HIGHEST);
+  TestJob* job_d = AddJob('d', HIGHEST);
 
   ASSERT_FALSE(job_b->running());
   ASSERT_FALSE(job_c->running());
-  job_b->ChangePriority(MEDIUM);
-  job_c->ChangePriority(LOW);
+  job_b->ChangePriority(HIGHEST);
+  job_c->ChangePriority(MEDIUM);
 
   ASSERT_TRUE(job_a->running());
   job_a->Finish();
   ASSERT_TRUE(job_d->running());
   job_d->Finish();
-
-  EXPECT_FALSE(job_e->running());
-  // Increasing |job_e|'s priority to HIGHEST should result in it being
-  // started immediately.
-  job_e->ChangePriority(HIGHEST);
-  ASSERT_TRUE(job_e->running());
-  job_e->Finish();
-
   ASSERT_TRUE(job_b->running());
   job_b->Finish();
   ASSERT_TRUE(job_c->running());
   job_c->Finish();
 
-  Expect("a.d.be..c.");
+  Expect("a.d.b.c.");
 }
 
 TEST_F(PrioritizedDispatcherTest, Cancel) {
@@ -373,64 +324,6 @@
   EXPECT_TRUE(dispatcher_->EvictOldestLowest() == NULL);
 }
 
-TEST_F(PrioritizedDispatcherTest, AddWhileDisabled) {
-  PrioritizedDispatcher::Limits limits(NUM_PRIORITIES, 1);
-  Prepare(limits);
-
-  dispatcher_->Disable();
-  TestJob* job_a = AddJob('a', MEDIUM);
-  TestJob* job_b = AddJobAtHead('b', MEDIUM);
-
-  EXPECT_FALSE(job_a->running());
-  EXPECT_FALSE(job_b->running());
-  EXPECT_EQ(0u, dispatcher_->num_running_jobs());
-  EXPECT_EQ(2u, dispatcher_->num_queued_jobs());
-}
-
-TEST_F(PrioritizedDispatcherTest, DisableThenCancel) {
-  PrioritizedDispatcher::Limits limits(NUM_PRIORITIES, 1);
-  Prepare(limits);
-
-  TestJob* job_a = AddJob('a', IDLE);
-  TestJob* job_b = AddJob('b', IDLE);
-  TestJob* job_c = AddJob('c', IDLE);
-  dispatcher_->Disable();
-
-  EXPECT_TRUE(job_a->running());
-  EXPECT_FALSE(job_b->running());
-  EXPECT_FALSE(job_c->running());
-  job_a->Finish();
-
-  EXPECT_FALSE(job_b->running());
-  EXPECT_FALSE(job_c->running());
-
-  job_b->Cancel();
-  EXPECT_FALSE(job_c->running());
-  job_c->Cancel();
-
-  Expect("a.");
-}
-
-TEST_F(PrioritizedDispatcherTest, DisableThenIncreatePriority) {
-  PrioritizedDispatcher::Limits limits(NUM_PRIORITIES, 2);
-  limits.reserved_slots[HIGHEST] = 1;
-  Prepare(limits);
-
-  TestJob* job_a = AddJob('a', IDLE);
-  TestJob* job_b = AddJob('b', IDLE);
-  EXPECT_TRUE(job_a->running());
-  EXPECT_FALSE(job_b->running());
-  dispatcher_->Disable();
-
-  job_b->ChangePriority(HIGHEST);
-  EXPECT_FALSE(job_b->running());
-  job_a->Finish();
-  EXPECT_FALSE(job_b->running());
-
-  job_b->Cancel();
-  Expect("a.");
-}
-
 #if GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 TEST_F(PrioritizedDispatcherTest, CancelNull) {
   PrioritizedDispatcher::Limits limits(NUM_PRIORITIES, 1);