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

content/browser/browsing_data/clear_site_data_throttle_browsertest.cc

 // Copyright 2016 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 "content/browser/browsing_data/clear_site_data_throttle.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 46 matching lines @@
 // information to the loaded website's title and C++ will wait until that
 // happens.
 void WaitForTitle(const Shell* shell, const char* expected_title) {
   base::string16 expected_title_16 = base::ASCIIToUTF16(expected_title);
   TitleWatcher title_watcher(shell->web_contents(), expected_title_16);
   ASSERT_EQ(expected_title_16, title_watcher.WaitAndGetTitle());
 }
 
 // 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.
 class TestBrowsingDataRemoverDelegate : public MockBrowsingDataRemoverDelegate {
  public:
   // Sets a test expectation that a Clear-Site-Data header call from |origin|,
   // instructing to delete |cookies|, |storage|, and |cache|, will schedule
   // the corresponding BrowsingDataRemover deletion tasks.
   void ExpectClearSiteDataCall(const url::Origin& origin,
                                bool cookies,
@@ skipping 645 matching lines @@
 // Tests that ClearSiteData() is called for the correct data types.
 IN_PROC_BROWSER_TEST_F(ClearSiteDataThrottleBrowserTest, Types) {
   GURL base_url = https_server()->GetURL("example.com", "/");
 
   struct TestCase {
     const char* value;
     bool remove_cookies;
     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) {
     GURL url = base_url;
     AddQuery(&url, "header", test_case.value);
 
     delegate()->ExpectClearSiteDataCall(
         url::Origin(url), test_case.remove_cookies, test_case.remove_storage,
         test_case.remove_cache);
 
@@ skipping 35 matching lines @@
 
   // There are two service workers installed on two origins.
   std::vector<ServiceWorkerUsageInfo> service_workers = GetServiceWorkers();
   EXPECT_EQ(2u, service_workers.size());
 
   // Navigate to a URL within the scope of "origin1.com" which responds with
   // a Clear-Site-Data header. Verify that this did NOT remove the service
   // 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());
 
   // This time, we will navigate to a URL on "origin1.com" that is not handled
   // by the serice worker, but results in a network request. One such resource
   // 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.
   service_workers = GetServiceWorkers();
   ASSERT_EQ(1u, service_workers.size());
   EXPECT_EQ(service_workers[0].origin,
             https_server()->GetURL("origin2.com", "/"));
 
   // TODO(msramek): Test that the service worker update ping also deletes
   // the service worker.
@@ skipping 20 matching lines @@
   std::set<std::string> entries_to_create = {url1, url2, url3, url4};
   util.CreateCacheEntries(entries_to_create);
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(kTimeoutMs));
 
   // There are four cache entries on two origins.
   std::vector<std::string> cache_keys = util.GetEntryKeys();
   EXPECT_EQ(4u, cache_keys.size());
 
   // 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));
 
   // Only "origin2.com" now has cache entries.
   cache_keys = util.GetEntryKeys();
   ASSERT_EQ(2u, cache_keys.size());
   std::sort(cache_keys.begin(), cache_keys.end());
   EXPECT_EQ(url4, cache_keys[0]);
   EXPECT_EQ(url3, cache_keys[1]);
 }
 
 // Tests that closing the tab right after executing Clear-Site-Data does
 // not crash.
 IN_PROC_BROWSER_TEST_F(ClearSiteDataThrottleBrowserTest, ClosedTab) {
   GURL url = https_server()->GetURL("example.com", "/");
   AddQuery(&url, "header", kClearCookiesHeader);
   shell()->LoadURL(url);
   shell()->Close();
 }
 
 }  // namespace content