Revert of Align `clear-site-data` syntax with the spec.

content/browser/browsing_data/clear_site_data_throttle_browsertest.cc

Index: content/browser/browsing_data/clear_site_data_throttle_browsertest.cc
diff --git a/content/browser/browsing_data/clear_site_data_throttle_browsertest.cc b/content/browser/browsing_data/clear_site_data_throttle_browsertest.cc
index 7df76d09bd0666d348f637d287cd47510f4d0c16..a58561492c3cd622081b9af299e2f85643f81211 100644
--- a/content/browser/browsing_data/clear_site_data_throttle_browsertest.cc
+++ b/content/browser/browsing_data/clear_site_data_throttle_browsertest.cc
@@ -64,7 +64,7 @@
 
 // A value of the Clear-Site-Data header that requests cookie deletion. Reused
 // in tests that need a valid header but do not depend on its value.
-static const char* kClearCookiesHeader = "\"cookies\"";
+static const char* kClearCookiesHeader = "{ \"types\": [ \"cookies\" ] }";
 
 // A helper class to observe BrowsingDataRemover deletion tasks coming from
 // ClearSiteData.
@@ -730,13 +730,14 @@
     bool remove_storage;
     bool remove_cache;
   } test_cases[] = {
-      {"\"cookies\"", true, false, false},
-      {"\"storage\"", false, true, false},
-      {"\"cache\"", false, false, true},
-      {"\"cookies\", \"storage\"", true, true, false},
-      {"\"cookies\", \"cache\"", true, false, true},
-      {"\"storage\", \"cache\"", false, true, true},
-      {"\"cookies\", \"storage\", \"cache\"", true, true, true},
+      {"{ \"types\": [ \"cookies\" ] }", true, false, false},
+      {"{ \"types\": [ \"storage\" ] }", false, true, false},
+      {"{ \"types\": [ \"cache\" ] }", false, false, true},
+      {"{ \"types\": [ \"cookies\", \"storage\" ] }", true, true, false},
+      {"{ \"types\": [ \"cookies\", \"cache\" ] }", true, false, true},
+      {"{ \"types\": [ \"storage\", \"cache\" ] }", false, true, true},
+      {"{ \"types\": [ \"cookies\", \"storage\", \"cache\" ] }", true, true,
+       true},
   };
 
   for (const TestCase& test_case : test_cases) {
@@ -792,7 +793,7 @@
   // worker for "origin1.com", as the header would not be respected outside
   // of the scope.
   GURL url = https_server()->GetURL("origin1.com", "/anything-in-the-scope");
-  AddQuery(&url, "header", "\"storage\"");
+  AddQuery(&url, "header", "{ \"types\": [ \"storage\" ] }");
   NavigateToURL(shell(), url);
   service_workers = GetServiceWorkers();
   EXPECT_EQ(2u, service_workers.size());
@@ -802,7 +803,7 @@
   // not handled by "worker.js" is the path "resource".
   // The header will be respected and the worker deleted.
   url = https_server()->GetURL("origin1.com", "/resource");
-  AddQuery(&url, "header", "\"storage\"");
+  AddQuery(&url, "header", "{ \"types\": [ \"storage\" ] }");
   NavigateToURL(shell(), url);
 
   // Only "origin2.com" now has a service worker.
@@ -843,7 +844,7 @@
 
   // Let Clear-Site-Data delete the "cache" of "origin1.com".
   GURL url = https_server()->GetURL("origin1.com", "/clear-site-data");
-  AddQuery(&url, "header", "\"cache\"");
+  AddQuery(&url, "header", "{ \"types\": [ \"cache\" ] }");
   NavigateToURL(shell(), url);
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(kTimeoutMs));