Support format dialog flag in browser tests

This CL adds support for file manager browser tests that have the
enhanced format dialog flag enabled.

Bug: 632988
Change-Id: I57d02530b8304487d5ff76c7a5538f379f86adb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1662987Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: Noel Gordon <noel@chromium.org>
Commit-Queue: Austin Tankiang <austinct@chromium.org>
Cr-Commit-Position: refs/heads/master@{#670365}

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

@@ -73,6 +73,11 @@ struct TestCase {
     return *this;
   }
 
+  TestCase& EnableFormatDialog() {
+    enable_format_dialog.emplace(true);
+    return *this;
+  }
+
   TestCase& EnableArc() {
     enable_arc = true;
     return *this;
@@ -138,6 +143,7 @@ struct TestCase {
   base::Optional<bool> enable_drivefs;
   base::Optional<bool> enable_myfiles_volume;
   base::Optional<bool> enable_documents_provider;
+  base::Optional<bool> enable_format_dialog;
   bool enable_arc = false;
   bool with_browser = false;
   bool needs_zip = false;
@@ -199,6 +205,11 @@ class FilesAppBrowserTest : public FileManagerBrowserTestBase,
         FileManagerBrowserTestBase::GetEnableDocumentsProvider());
   }
 
+  bool GetEnableFormatDialog() const override {
+    return GetParam().enable_format_dialog.value_or(
+        FileManagerBrowserTestBase::GetEnableFormatDialog());
+  }
+
   bool GetEnableArc() const override { return GetParam().enable_arc; }
 
   bool GetRequiresStartupBrowser() const override {

chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc

@@ -1570,6 +1570,11 @@ void FileManagerBrowserTestBase::SetUpCommandLine(
         arc::kEnableDocumentsProviderInFilesAppFeature);
   }
 
+  if (IsFormatDialogTest()) {
+    enabled_features.emplace_back(
+        chromeos::features::kEnableFileManagerFormatDialog);
+  }
+
   feature_list_.InitWithFeatures(enabled_features, disabled_features);
 
   extensions::ExtensionApiTest::SetUpCommandLine(command_line);
@@ -1733,6 +1738,10 @@ bool FileManagerBrowserTestBase::GetEnableDocumentsProvider() const {
   return false;
 }
 
+bool FileManagerBrowserTestBase::GetEnableFormatDialog() const {
+  return false;
+}
+
 bool FileManagerBrowserTestBase::GetEnableArc() const {
   return false;
 }

chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h

@@ -63,6 +63,7 @@ class FileManagerBrowserTestBase : public extensions::ExtensionApiTest {
   virtual bool GetEnableMyFilesVolume() const;
   virtual bool GetEnableDocumentsProvider() const;
   virtual bool GetEnableArc() const;
+  virtual bool GetEnableFormatDialog() const;
   virtual bool GetRequiresStartupBrowser() const;
   virtual bool GetNeedsZipSupport() const;
   virtual bool GetIsOffline() const;
@@ -92,6 +93,9 @@ class FileManagerBrowserTestBase : public extensions::ExtensionApiTest {
   // Returns true if the test requires Android documents providers.
   bool IsDocumentsProviderTest() const { return GetEnableDocumentsProvider(); }
 
+  // Returns true if the test requires the FormatDialog feature enabled.
+  bool IsFormatDialogTest() const { return GetEnableFormatDialog(); }
+
   // Returns true if the test requires ARC++.
   bool IsArcTest() const { return GetEnableArc(); }