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

content/browser/browsing_data/clear_site_data_throttle_unittest.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/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
@@ skipping 15 matching lines @@
 using ::testing::_;
 
 namespace content {
 
 using ConsoleMessagesDelegate = ClearSiteDataThrottle::ConsoleMessagesDelegate;
 
 namespace {
 
 const char kClearSiteDataHeaderPrefix[] = "Clear-Site-Data: ";
 
-const char kClearCookiesHeader[] = "Clear-Site-Data: \"cookies\"";
+const char kClearCookiesHeader[] =
+    "Clear-Site-Data: { \"types\": [ \"cookies\" ] }";
 
 void WaitForUIThread() {
   base::RunLoop run_loop;
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, run_loop.QuitClosure());
   run_loop.Run();
 }
 
 // Used to verify that resource throttle delegate calls are made.
 class MockResourceThrottleDelegate : public ResourceThrottle::Delegate {
  public:
@@ skipping 119 matching lines @@
 }
 
 TEST_F(ClearSiteDataThrottleTest, ParseHeaderAndExecuteClearingTask) {
   struct TestCase {
     const char* header;
     bool cookies;
     bool storage;
     bool cache;
   } test_cases[] = {
       // One data type.
-      {"\"cookies\"", true, false, false},
-      {"\"storage\"", false, true, false},
-      {"\"cache\"", false, false, true},
+      {"{ \"types\": [\"cookies\"] }", true, false, false},
+      {"{ \"types\": [\"storage\"] }", false, true, false},
+      {"{ \"types\": [\"cache\"] }", false, false, true},
 
       // Two data types.
-      {"\"cookies\", \"storage\"", true, true, false},
-      {"\"cookies\", \"cache\"", true, false, true},
-      {"\"storage\", \"cache\"", false, true, true},
+      {"{ \"types\": [\"cookies\", \"storage\"] }", true, true, false},
+      {"{ \"types\": [\"cookies\", \"cache\"] }", true, false, true},
+      {"{ \"types\": [\"storage\", \"cache\"] }", false, true, true},
 
       // Three data types.
-      {"\"storage\", \"cache\", \"cookies\"", true, true, true},
-      {"\"cache\", \"cookies\", \"storage\"", true, true, true},
-      {"\"cookies\", \"storage\", \"cache\"", true, true, true},
+      {"{ \"types\": [\"storage\", \"cache\", \"cookies\"] }", true, true,
+       true},
+      {"{ \"types\": [\"cache\", \"cookies\", \"storage\"] }", true, true,
+       true},
+      {"{ \"types\": [\"cookies\", \"storage\", \"cache\"] }", true, true,
+       true},
 
       // Different formatting.
-      {"\"cookies\"", true, false, false},
+      {"  { \"types\":   [\"cookies\" ]}", true, false, false},
 
       // Duplicates.
-      {"\"cookies\", \"cookies\"", true, false, false},
+      {"{ \"types\": [\"cookies\", \"cookies\"] }", true, false, false},
 
-      // Other JSON-formatted items in the list.
-      {"\"storage\", { \"other_params\": {} }", false, true, false},
+      // Other entries in the dictionary.
+      {"{ \"types\": [\"storage\"], \"other_params\": {} }", false, true,
+       false},
 
       // Unknown types are ignored, but we still proceed with the deletion for
       // those that we recognize.
-      {"\"cache\", \"foo\"", false, false, true},
+      {"{ \"types\": [\"cache\", \"foo\"] }", false, false, true},
   };
 
   for (const TestCase& test_case : test_cases) {
     SCOPED_TRACE(test_case.header);
 
     // Test that ParseHeader works correctly.
     bool actual_cookies;
     bool actual_storage;
     bool actual_cache;
 
@@ skipping 28 matching lines @@
 
     testing::Mock::VerifyAndClearExpectations(&throttle);
   }
 }
 
 TEST_F(ClearSiteDataThrottleTest, InvalidHeader) {
   struct TestCase {
     const char* header;
     const char* console_message;
   } test_cases[] = {
-      {"", "No recognized types specified.\n"},
-      {"\"unclosed", "The header's value does not parse as valid JSON.\n"},
-      {"\"passwords\"",
+      {"", "Expected valid JSON.\n"},
+      {"\"unclosed quote", "Expected valid JSON.\n"},
+      {"\"some text\"", "Expected a JSON dictionary with a 'types' field.\n"},
+      {"{ \"field\" : {} }",
+       "Expected a JSON dictionary with a 'types' field.\n"},
+      {"{ \"types\" : [ \"passwords\" ] }",
        "Unrecognized type: \"passwords\".\n"
-       "No recognized types specified.\n"},
-      {"[ \"list\" ]",
-       "Unrecognized type: [\"list\"].\n"
-       "No recognized types specified.\n"},
-      {"[ \"list\" ]",
-       "Unrecognized type: [\"list\"].\n"
-       "No recognized types specified.\n"},
-      {"{ \"cookies\": [ \"a\" ] }",
-       "Unrecognized type: {\"cookies\":[\"a\"]}.\n"
-       "No recognized types specified.\n"},
-      {"\"кукис\", \"сторидж\", \"кэш\"",
+       "No recognized types specified in the 'types' field.\n"},
+      {"{ \"types\" : [ [ \"list in a list\" ] ] }",
+       "Unrecognized type: [\"list in a list\"].\n"
+       "No recognized types specified in the 'types' field.\n"},
+      {"{ \"types\" : [ \"кукис\", \"сторидж\", \"кэш\" ]",
        "Must only contain ASCII characters.\n"}};
 
   for (const TestCase& test_case : test_cases) {
     SCOPED_TRACE(test_case.header);
 
     bool actual_cookies;
     bool actual_storage;
     bool actual_cache;
 
     ConsoleMessagesDelegate console_delegate;
@@ skipping 121 matching lines @@
       {START, kClearCookiesHeader, false},
 
       // The throttle does not defer redirects if there are no interesting
       // response headers.
       {REDIRECT, "", false},
       {REDIRECT, "Set-Cookie: abc=123;", false},
       {REDIRECT, "Content-Type: image/png;", false},
 
       // That includes malformed Clear-Site-Data headers or header values
       // that do not lead to deletion.
-      {REDIRECT, "Clear-Site-Data: cookies", false},
-      {REDIRECT, "Clear-Site-Data: \"unknown type\"", false},
+      {REDIRECT, "Clear-Site-Data: { types: cookies } ", false},
+      {REDIRECT, "Clear-Site-Data: { \"types\": [ \"unknown type\" ] }", false},
 
       // However, redirects are deferred for valid Clear-Site-Data headers.
-      {REDIRECT, "Clear-Site-Data: \"cookies\", \"unknown type\"", true},
+      {REDIRECT,
+       "Clear-Site-Data: { \"types\": [ \"cookies\", \"unknown type\" ] }",
+       true},
       {REDIRECT,
        base::StringPrintf("Content-Type: image/png;\n%s", kClearCookiesHeader),
        true},
       {REDIRECT,
        base::StringPrintf("%s\nContent-Type: image/png;", kClearCookiesHeader),
        true},
 
-      // Multiple instances of the header will be parsed correctly.
+      // We expect at most one instance of the header. Multiple instances
+      // will not be parsed currently. This is not an inherent property of
+      // Clear-Site-Data, just a documentation of the current behavior.
       {REDIRECT,
        base::StringPrintf("%s\n%s", kClearCookiesHeader, kClearCookiesHeader),
-       true},
+       false},
 
       // Final response headers are treated the same way as in the case
       // of redirect.
       {REDIRECT, "Set-Cookie: abc=123;", false},
-      {REDIRECT, "Clear-Site-Data: cookies", false},
+      {REDIRECT, "Clear-Site-Data: { types: cookies } ", false},
       {REDIRECT, kClearCookiesHeader, true},
   };
 
   struct TestOrigin {
     const char* origin;
     bool valid;
   } kTestOrigins[] = {
       // The throttle only works on secure origins.
       {"https://secure-origin.com", true},
       {"filesystem:https://secure-origin.com/temporary/", true},
@@ skipping 68 matching lines @@
 
 // Verifies that console outputs from various actions on different URLs
 // are correctly pretty-printed to the console.
 TEST_F(ClearSiteDataThrottleTest, FormattedConsoleOutput) {
   struct TestCase {
     const char* header;
     const char* url;
     const char* output;
   } kTestCases[] = {
       // Successful deletion outputs one line.
-      {"\"cookies\"", "https://origin1.com/foo",
+      {"{ \"types\": [ \"cookies\" ] }", "https://origin1.com/foo",
        "Clear-Site-Data header on 'https://origin1.com/foo': "
        "Cleared data types: cookies.\n"},
 
       // Another successful deletion.
-      {"\"storage\"", "https://origin2.com/foo",
+      {"{ \"types\": [ \"storage\" ] }", "https://origin2.com/foo",
        "Clear-Site-Data header on 'https://origin2.com/foo': "
        "Cleared data types: storage.\n"},
 
       // Redirect to the same URL. Unsuccessful deletion outputs two lines.
-      {"\"foo\"", "https://origin2.com/foo",
+      {"{ \"foo\": \"bar\" }", "https://origin2.com/foo",
        "Clear-Site-Data header on 'https://origin2.com/foo': "
-       "Unrecognized type: \"foo\".\n"
-       "Clear-Site-Data header on 'https://origin2.com/foo': "
-       "No recognized types specified.\n"},
+       "Expected a JSON dictionary with a 'types' field.\n"},
 
       // Redirect to another URL. Another unsuccessful deletion.
       {"\"some text\"", "https://origin3.com/bar",
        "Clear-Site-Data header on 'https://origin3.com/bar': "
-       "Unrecognized type: \"some text\".\n"
-       "Clear-Site-Data header on 'https://origin3.com/bar': "
-       "No recognized types specified.\n"},
+       "Expected a JSON dictionary with a 'types' field.\n"},
 
       // Yet another on the same URL.
-      {"\"passwords\"", "https://origin3.com/bar",
+      {"{ \"types\" : [ \"passwords\" ] }", "https://origin3.com/bar",
        "Clear-Site-Data header on 'https://origin3.com/bar': "
        "Unrecognized type: \"passwords\".\n"
        "Clear-Site-Data header on 'https://origin3.com/bar': "
-       "No recognized types specified.\n"},
+       "No recognized types specified in the 'types' field.\n"},
 
       // Successful deletion on the same URL.
-      {"\"cache\"", "https://origin3.com/bar",
+      {"{ \"types\": [ \"cache\" ] }", "https://origin3.com/bar",
        "Clear-Site-Data header on 'https://origin3.com/bar': "
        "Cleared data types: cache.\n"},
 
       // Redirect to the original URL.
       // Successful deletion outputs one line.
       {"", "https://origin1.com/foo",
        "Clear-Site-Data header on 'https://origin1.com/foo': "
-       "No recognized types specified.\n"}};
+       "Expected valid JSON.\n"}};
 
   bool kThrottleTypeIsNavigation[] = {true, false};
 
   for (bool navigation : kThrottleTypeIsNavigation) {
     SCOPED_TRACE(navigation ? "Navigation test." : "Subresource test.");
 
     net::TestURLRequestContext context;
     std::unique_ptr<net::URLRequest> request(context.CreateRequest(
         GURL(kTestCases[0].url), net::DEFAULT_PRIORITY, nullptr));
     ResourceRequestInfo::AllocateForTesting(
@@ skipping 52 matching lines @@
     // At the end, the console must contain all messages regardless of whether
     // it was a navigation or a subresource request.
     std::string expected_output;
     for (struct TestCase& test_case : kTestCases)
       expected_output += test_case.output;
     EXPECT_EQ(expected_output, output_buffer);
   }
 }
 
 }  // namespace content