Clears out external protocol data when cookies and site data is cleared.

chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

 // Copyright (c) 2012 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 <memory>
 #include <string>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/pattern.h"
@@ skipping 23 matching lines @@
   EXTENSION = BrowsingDataHelper::EXTENSION
 };
 
 const char kRemoveEverythingArguments[] =
     "[{\"since\": 1000}, {"
     "\"appcache\": true, \"cache\": true, \"cookies\": true, "
     "\"downloads\": true, \"fileSystems\": true, \"formData\": true, "
     "\"history\": true, \"indexedDB\": true, \"localStorage\": true, "
     "\"serverBoundCertificates\": true, \"passwords\": true, "
     "\"pluginData\": true, \"serviceWorkers\": true, \"cacheStorage\": true, "
-    "\"webSQL\": true"
+    "\"webSQL\": true, \"externalProtocolData\": true"
     "}]";
 
 class ExtensionBrowsingDataTest : public InProcessBrowserTest {
  public:
   const base::Time& GetBeginTime() {
     return remover_->GetLastUsedBeginTime();
   }
 
   int GetRemovalMask() {
     return remover_->GetLastUsedRemovalMask();
@@ skipping 159 matching lines @@
                   BrowsingDataRemover::REMOVE_PLUGIN_DATA) |
         GetAsMask(data_to_remove, "passwords",
                   BrowsingDataRemover::REMOVE_PASSWORDS) |
         GetAsMask(data_to_remove, "serviceWorkers",
                   BrowsingDataRemover::REMOVE_SERVICE_WORKERS) |
         GetAsMask(data_to_remove, "cacheStorage",
                   BrowsingDataRemover::REMOVE_CACHE_STORAGE) |
         GetAsMask(data_to_remove, "webSQL",
                   BrowsingDataRemover::REMOVE_WEBSQL) |
         GetAsMask(data_to_remove, "serverBoundCertificates",
-                  BrowsingDataRemover::REMOVE_CHANNEL_IDS);
+                  BrowsingDataRemover::REMOVE_CHANNEL_IDS) |
+        GetAsMask(data_to_remove, "externalProtocolData",
+                  BrowsingDataRemover::REMOVE_EXTERNAL_PROTOCOL_DATA);
+
     EXPECT_EQ(expected_removal_mask, removal_mask);
   }
 
   // The kAllowDeletingBrowserHistory pref must be set to false before this
   // is called.
   void CheckRemovalPermitted(const std::string& data_types, bool permitted) {
     scoped_refptr<BrowsingDataRemoveFunction> function =
         new BrowsingDataRemoveFunction();
     std::string args = "[{\"since\": 1}," + data_types + "]";
 
@@ skipping 26 matching lines @@
   CheckRemovalPermitted("{\"fileSystems\": true}", true);
   CheckRemovalPermitted("{\"formData\": true}", true);
   CheckRemovalPermitted("{\"history\": true}", false);
   CheckRemovalPermitted("{\"indexedDB\": true}", true);
   CheckRemovalPermitted("{\"localStorage\": true}", true);
   CheckRemovalPermitted("{\"serverBoundCertificates\": true}", true);
   CheckRemovalPermitted("{\"passwords\": true}", true);
   CheckRemovalPermitted("{\"serviceWorkers\": true}", true);
   CheckRemovalPermitted("{\"cacheStorage\": true}", true);
   CheckRemovalPermitted("{\"webSQL\": true}", true);
+  CheckRemovalPermitted("{\"externalProtocolData\": true}", true);
 
   // The entire removal is prohibited if any part is.
   CheckRemovalPermitted("{\"cache\": true, \"history\": true}", false);
   CheckRemovalPermitted("{\"cookies\": true, \"downloads\": true}", false);
 
   // If a prohibited type is not selected, the removal is OK.
   CheckRemovalPermitted("{\"history\": false}", true);
   CheckRemovalPermitted("{\"downloads\": false}", true);
   CheckRemovalPermitted("{\"cache\": true, \"history\": false}", true);
   CheckRemovalPermitted("{\"cookies\": true, \"downloads\": false}", true);
@@ skipping 75 matching lines @@
       BrowsingDataRemover::REMOVE_CHANNEL_IDS);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "passwords", BrowsingDataRemover::REMOVE_PASSWORDS);
   // We can't remove plugin data inside a test profile.
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "serviceWorkers", BrowsingDataRemover::REMOVE_SERVICE_WORKERS);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "cacheStorage", BrowsingDataRemover::REMOVE_CACHE_STORAGE);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "webSQL", BrowsingDataRemover::REMOVE_WEBSQL);
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
+      "externalProtocolData",
+      BrowsingDataRemover::REMOVE_EXTERNAL_PROTOCOL_DATA);
 }
 
 // Test an arbitrary combination of data types.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
                        BrowsingDataRemovalMaskCombination) {
   RunBrowsingDataRemoveFunctionAndCompareRemovalMask(
        "{\"appcache\": true, \"cookies\": true, \"history\": true}",
        BrowsingDataRemover::REMOVE_APPCACHE |
            BrowsingDataRemover::REMOVE_COOKIES |
            BrowsingDataRemover::REMOVE_HISTORY);
@@ skipping 138 matching lines @@
 
   SetPrefsAndVerifySettings(
       BrowsingDataRemover::REMOVE_COOKIES |
           BrowsingDataRemover::REMOVE_HISTORY |
           BrowsingDataRemover::REMOVE_DOWNLOADS,
     UNPROTECTED_WEB,
     site_data_no_plugins_durable_usage |
         BrowsingDataRemover::REMOVE_HISTORY |
         BrowsingDataRemover::REMOVE_DOWNLOADS);
 }