Fix aborting in throttled file system (FSP).

chrome/browser/chromeos/file_system_provider/queue_unittest.cc

 // Copyright 2015 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/chromeos/file_system_provider/queue.h"
 
 #include <vector>
 
 #include "base/files/file.h"
 #include "base/run_loop.h"
@@ skipping 264 matching lines @@
   int first_abort_counter = 0;
   queue.Enqueue(first_token,
                 base::Bind(&OnRun, &first_counter, &first_abort_counter));
 
   base::RunLoop().RunUntilIdle();
 
   queue.Abort(first_token);
   EXPECT_DEATH(queue.Abort(first_token), "");
 }
 
+TEST_F(FileSystemProviderQueueTest, InvalidUsage_IsAbortedWhileNotInQueue) {
+  Queue queue(1);
+  EXPECT_DEATH(queue.IsAborted(1234), "");
+}
+
+TEST_F(FileSystemProviderQueueTest, InvalidUsage_IsAbortedAfterRemoved) {
+  Queue queue(1);
+  const size_t first_token = queue.NewToken();
+  int first_counter = 0;
+  int first_abort_counter = 0;
+  queue.Enqueue(first_token,
+                base::Bind(&OnRun, &first_counter, &first_abort_counter));
+
+  base::RunLoop().RunUntilIdle();
+
+  queue.Abort(first_token);
+  queue.Remove(first_token);
+  EXPECT_DEATH(queue.IsAborted(first_token), "");
+}
+
 TEST_F(FileSystemProviderQueueTest, InvalidUsage_RemoveTwice) {
   Queue queue(1);
   const size_t first_token = queue.NewToken();
   int first_counter = 0;
   int first_abort_counter = 0;
   queue.Enqueue(first_token,
                 base::Bind(&OnRun, &first_counter, &first_abort_counter));
 
   base::RunLoop().RunUntilIdle();
 
@@ skipping 61 matching lines @@
   queue.Enqueue(second_token,
                 base::Bind(&OnRun, &second_counter, &second_abort_counter));
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, first_counter);
   EXPECT_EQ(0, first_abort_counter);
   EXPECT_EQ(0, second_counter);
   EXPECT_EQ(0, second_abort_counter);
 
   // Abort the first task while it's being executed.
+  EXPECT_FALSE(queue.IsAborted(first_token));
   queue.Abort(first_token);
+  EXPECT_TRUE(queue.IsAborted(first_token));
   queue.Remove(first_token);
 
   // Abort the second task, before it's started.
   EXPECT_EQ(0, second_counter);
+  EXPECT_FALSE(queue.IsAborted(second_token));
   queue.Abort(second_token);
+  EXPECT_TRUE(queue.IsAborted(second_token));
   queue.Remove(second_token);
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, first_counter);
   EXPECT_EQ(1, first_abort_counter);
   EXPECT_EQ(0, second_counter);
   EXPECT_EQ(0, second_abort_counter);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos