WebRequestApiTest: run test_auth_required* also with incognito flags

In the previous change, test_auth_required.html was split into three
tests, and ExtensionWebRequestApiTest.WebRequestAuthRequired test is
also split into three to run each respectively.

However, WebRequestAuthRequiredIncognito also ran the same test.
So, we should run these split three tests with incognito flags too.

This change modifies the webRequestAuthRequired* tests to take a param
so that these three tests run with/without incognito flags.

Bug: 940347
Change-Id: I8319cb41d62456c12c0b572032658630719c28c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1535724
Auto-Submit: Takashi Toyoshima <toyoshim@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: Takashi Toyoshima <toyoshim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#644198}

chrome/browser/extensions/api/web_request/web_request_apitest.cc

@@ -550,45 +550,62 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest,
       message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestAuthRequired) {
-  CancelLoginDialog login_dialog_helper;
+enum class ProfileMode {
+  kUserProfile,
+  kIncognito,
+};
 
-  ASSERT_TRUE(StartEmbeddedTestServer());
-  ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) <<
-      message_;
-}
+class ExtensionWebRequestApiAuthRequiredTest
+    : public ExtensionWebRequestApiTest,
+      public testing::WithParamInterface<ProfileMode> {
+ public:
+  int GetFlags() {
+    switch (GetParam()) {
+      case ProfileMode::kUserProfile:
+        return kFlagEnableFileAccess;
+      case ProfileMode::kIncognito:
+        return kFlagEnableIncognito | kFlagUseIncognito | kFlagEnableFileAccess;
+    }
+  }
+};
 
-IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest,
-                       WebRequestAuthRequiredAsync) {
+IN_PROC_BROWSER_TEST_P(ExtensionWebRequestApiAuthRequiredTest,
+                       WebRequestAuthRequired) {
   CancelLoginDialog login_dialog_helper;
 
   ASSERT_TRUE(StartEmbeddedTestServer());
-  ASSERT_TRUE(
-      RunExtensionSubtest("webrequest", "test_auth_required_async.html"))
+  ASSERT_TRUE(RunExtensionSubtestWithArgAndFlags(
+      "webrequest", "test_auth_required.html", nullptr, GetFlags()))
       << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest,
-                       WebRequestAuthRequiredParallel) {
+IN_PROC_BROWSER_TEST_P(ExtensionWebRequestApiAuthRequiredTest,
+                       WebRequestAuthRequiredAsync) {
   CancelLoginDialog login_dialog_helper;
 
   ASSERT_TRUE(StartEmbeddedTestServer());
-  ASSERT_TRUE(
-      RunExtensionSubtest("webrequest", "test_auth_required_parallel.html"))
+  ASSERT_TRUE(RunExtensionSubtestWithArgAndFlags(
+      "webrequest", "test_auth_required_async.html", nullptr, GetFlags()))
       << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest,
-                       WebRequestAuthRequiredIncognito) {
+IN_PROC_BROWSER_TEST_P(ExtensionWebRequestApiAuthRequiredTest,
+                       WebRequestAuthRequiredParallel) {
   CancelLoginDialog login_dialog_helper;
 
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(RunExtensionSubtestWithArgAndFlags(
-      "webrequest", "test_auth_required.html", nullptr,
-      kFlagEnableIncognito | kFlagUseIncognito | kFlagEnableFileAccess))
+      "webrequest", "test_auth_required_parallel.html", nullptr, GetFlags()))
       << message_;
 }
 
+INSTANTIATE_TEST_SUITE_P(UserProfile,
+                         ExtensionWebRequestApiAuthRequiredTest,
+                         ::testing::Values(ProfileMode::kUserProfile));
+INSTANTIATE_TEST_SUITE_P(Incognito,
+                         ExtensionWebRequestApiAuthRequiredTest,
+                         ::testing::Values(ProfileMode::kIncognito));
+
 // This test times out regularly on win_rel trybots. See http://crbug.com/122178
 // Also on Linux/ChromiumOS debug, ASAN and MSAN builds.
 // https://crbug.com/670415