Deflake ImageWriterUtilityClient browsertest and clients

chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc

Index: chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc
index f3307b455b73d3741da83034c269f803eb7ae5de..ebb39cf7408bb5e7875f98643dae2c4c11bf39e4 100644
--- a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc
+++ b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc
@@ -59,7 +59,7 @@ class ImageWriterUtilityClientTest : public InProcessBrowserTest {
     cancel_ = (option == CANCEL);
 
     content::BrowserThread::PostTask(
-        content::BrowserThread::IO, FROM_HERE,
+        content::BrowserThread::FILE, FROM_HERE,
         base::Bind(&ImageWriterUtilityClientTest::StartWriteTest,
                    base::Unretained(this)));
     run_loop.Run();
@@ -75,7 +75,7 @@ class ImageWriterUtilityClientTest : public InProcessBrowserTest {
     cancel_ = (option == CANCEL);
 
     content::BrowserThread::PostTask(
-        content::BrowserThread::IO, FROM_HERE,
+        content::BrowserThread::FILE, FROM_HERE,
         base::Bind(&ImageWriterUtilityClientTest::StartVerifyTest,
                    base::Unretained(this)));
     run_loop.Run();
@@ -89,7 +89,7 @@ class ImageWriterUtilityClientTest : public InProcessBrowserTest {
 
  private:
   void StartWriteTest() {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+    DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
     if (!image_writer_utility_client_)
       image_writer_utility_client_ = new ImageWriterUtilityClient();
@@ -107,7 +107,7 @@ class ImageWriterUtilityClientTest : public InProcessBrowserTest {
   }
 
   void Progress(int64_t progress) {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+    DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
     progress_ = progress;
     if (!cancel_)
@@ -118,7 +118,7 @@ class ImageWriterUtilityClientTest : public InProcessBrowserTest {
   }
 
   void Success() {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+    DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
     EXPECT_EQ(kTestFileSize, progress_);
     EXPECT_FALSE(cancel_);
@@ -130,13 +130,13 @@ class ImageWriterUtilityClientTest : public InProcessBrowserTest {
     }
 
     content::BrowserThread::PostTask(
-        content::BrowserThread::IO, FROM_HERE,
+        content::BrowserThread::FILE, FROM_HERE,
         base::Bind(&ImageWriterUtilityClientTest::Shutdown,
                    base::Unretained(this)));
   }
 
   void StartVerifyTest() {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+    DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
     if (!image_writer_utility_client_)
       image_writer_utility_client_ = new ImageWriterUtilityClient();
@@ -154,33 +154,33 @@ class ImageWriterUtilityClientTest : public InProcessBrowserTest {
   }
 
   void Failure(const std::string& error) {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+    DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
     EXPECT_FALSE(error.empty());
     success_ = false;
     error_ = error;
 
     content::BrowserThread::PostTask(
-        content::BrowserThread::IO, FROM_HERE,
+        content::BrowserThread::FILE, FROM_HERE,
         base::Bind(&ImageWriterUtilityClientTest::Shutdown,
                    base::Unretained(this)));
   }
 
   void Verified() {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+    DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
     EXPECT_EQ(kTestFileSize, progress_);
     EXPECT_FALSE(cancel_);
     success_ = !cancel_;
 
     content::BrowserThread::PostTask(
-        content::BrowserThread::IO, FROM_HERE,
+        content::BrowserThread::FILE, FROM_HERE,
         base::Bind(&ImageWriterUtilityClientTest::Shutdown,
                    base::Unretained(this)));
   }
 
   void Cancelled() {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+    DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
     EXPECT_TRUE(cancel_);
     success_ = cancel_;
@@ -191,7 +191,7 @@ class ImageWriterUtilityClientTest : public InProcessBrowserTest {
   }
 
   void Shutdown() {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+    DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
     image_writer_utility_client_->Shutdown();
 
@@ -259,8 +259,7 @@ IN_PROC_BROWSER_TEST_F(ImageWriterUtilityClientTest, WriteVerify) {
   EXPECT_TRUE(error().empty());
 }
 
-// TODO(crbug.com/690717): test is flaky.
-IN_PROC_BROWSER_TEST_F(ImageWriterUtilityClientTest, DISABLED_WriteCancel) {
+IN_PROC_BROWSER_TEST_F(ImageWriterUtilityClientTest, WriteCancel) {
   FillImageFileWithPattern('a');
   FillDeviceFileWithPattern(0);
 
@@ -306,8 +305,7 @@ IN_PROC_BROWSER_TEST_F(ImageWriterUtilityClientTest, Verify) {
   EXPECT_TRUE(error().empty());
 }
 
-// TODO(crbug.com/690717): test is flaky.
-IN_PROC_BROWSER_TEST_F(ImageWriterUtilityClientTest, DISABLED_VerifyCancel) {
+IN_PROC_BROWSER_TEST_F(ImageWriterUtilityClientTest, VerifyCancel) {
   FillImageFileWithPattern('s');
   FillDeviceFileWithPattern('s');