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

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

Index: chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
index 7cbdbbb51e4c6622129ee93575b62772a8e2bebc..10efc181e6f5a1ba97de01b749ee94a4f69d15c5 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
@@ -222,6 +222,7 @@ class ExtensionBrowsingDataTest : public InProcessBrowserTest {
                   BrowsingDataRemover::REMOVE_WEBSQL) |
         GetAsMask(data_to_remove, "serverBoundCertificates",
                   BrowsingDataRemover::REMOVE_CHANNEL_IDS);
+
     EXPECT_EQ(expected_removal_mask, removal_mask);
   }
 
@@ -288,21 +289,25 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, RemoveBrowsingDataAll) {
                                                    browser()));
 
   EXPECT_EQ(base::Time::FromDoubleT(1.0), GetBeginTime());
-  EXPECT_EQ((BrowsingDataRemover::REMOVE_SITE_DATA |
-             BrowsingDataRemover::REMOVE_CACHE |
-             BrowsingDataRemover::REMOVE_DOWNLOADS |
-             BrowsingDataRemover::REMOVE_FORM_DATA |
-             BrowsingDataRemover::REMOVE_HISTORY |
-             BrowsingDataRemover::REMOVE_PASSWORDS) &
-             // TODO(benwells): implement clearing of site usage data via the
-             // browsing data API. https://crbug.com/500801.
-             ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA &
-             // TODO(dmurph): implement clearing of durable storage permission
-             // via the browsing data API. https://crbug.com/500801.
-             ~BrowsingDataRemover::REMOVE_DURABLE_PERMISSION &
-             // We can't remove plugin data inside a test profile.
-             ~BrowsingDataRemover::REMOVE_PLUGIN_DATA,
-            GetRemovalMask());
+  EXPECT_EQ(
+      (BrowsingDataRemover::REMOVE_SITE_DATA |
+       BrowsingDataRemover::REMOVE_CACHE |
+       BrowsingDataRemover::REMOVE_DOWNLOADS |
+       BrowsingDataRemover::REMOVE_FORM_DATA |
+       BrowsingDataRemover::REMOVE_HISTORY |
+       BrowsingDataRemover::REMOVE_PASSWORDS) &
+          // TODO(benwells): implement clearing of site usage data via the
+          // browsing data API. https://crbug.com/500801.
+          ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA &
+          // TODO(dmurph): implement clearing of durable storage permission
+          // via the browsing data API. https://crbug.com/500801.
+          ~BrowsingDataRemover::REMOVE_DURABLE_PERMISSION &
+          // We can't remove plugin data inside a test profile.
+          ~BrowsingDataRemover::REMOVE_PLUGIN_DATA &
+          // TODO(ramyasharma): implement clearing of external protocol data
+          // via the browsing data API. https://crbug.com/692850.
+          ~BrowsingDataRemover::REMOVE_EXTERNAL_PROTOCOL_DATA,
+      GetRemovalMask());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, BrowsingDataOriginTypeMask) {
@@ -478,46 +483,46 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSimple) {
 
 // Test cookie and app data settings.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSiteData) {
-  int site_data_no_durable_or_usage =
+  int site_data_no_durable_or_usage_or_external =
       BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA &
-      ~BrowsingDataRemover::REMOVE_DURABLE_PERMISSION;
-  int site_data_no_plugins_durable_usage =
-      site_data_no_durable_or_usage & ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
+      ~BrowsingDataRemover::REMOVE_DURABLE_PERMISSION &
+      ~BrowsingDataRemover::REMOVE_EXTERNAL_PROTOCOL_DATA;
+  int site_data_no_plugins_durable_usage_external =
+      site_data_no_durable_or_usage_or_external &
+      ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
 
   SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_COOKIES,
                             UNPROTECTED_WEB,
-                            site_data_no_plugins_durable_usage);
+                            site_data_no_plugins_durable_usage_external);
   SetPrefsAndVerifySettings(
-      BrowsingDataRemover::REMOVE_HOSTED_APP_DATA_TESTONLY,
-      PROTECTED_WEB,
-      site_data_no_plugins_durable_usage);
+      BrowsingDataRemover::REMOVE_HOSTED_APP_DATA_TESTONLY, PROTECTED_WEB,
+      site_data_no_plugins_durable_usage_external);
   SetPrefsAndVerifySettings(
       BrowsingDataRemover::REMOVE_COOKIES |
           BrowsingDataRemover::REMOVE_HOSTED_APP_DATA_TESTONLY,
       PROTECTED_WEB | UNPROTECTED_WEB,
-      site_data_no_plugins_durable_usage);
-  SetPrefsAndVerifySettings(
-      BrowsingDataRemover::REMOVE_COOKIES |
-          BrowsingDataRemover::REMOVE_PLUGIN_DATA,
-      UNPROTECTED_WEB,
-      site_data_no_durable_or_usage);
+      site_data_no_plugins_durable_usage_external);
+  SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_COOKIES |
+                                BrowsingDataRemover::REMOVE_PLUGIN_DATA,
+                            UNPROTECTED_WEB,
+                            site_data_no_durable_or_usage_or_external);
 }
 
 // Test an arbitrary assortment of settings.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionAssorted) {
-  int site_data_no_plugins_durable_usage =
+  int site_data_no_plugins_durable_usage_external =
       BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_DURABLE_PERMISSION &
       ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA &
-      ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
+      ~BrowsingDataRemover::REMOVE_PLUGIN_DATA &
+      ~BrowsingDataRemover::REMOVE_EXTERNAL_PROTOCOL_DATA;
 
-  SetPrefsAndVerifySettings(
-      BrowsingDataRemover::REMOVE_COOKIES |
-          BrowsingDataRemover::REMOVE_HISTORY |
-          BrowsingDataRemover::REMOVE_DOWNLOADS,
-    UNPROTECTED_WEB,
-    site_data_no_plugins_durable_usage |
-        BrowsingDataRemover::REMOVE_HISTORY |
-        BrowsingDataRemover::REMOVE_DOWNLOADS);
+  SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_COOKIES |
+                                BrowsingDataRemover::REMOVE_HISTORY |
+                                BrowsingDataRemover::REMOVE_DOWNLOADS,
+                            UNPROTECTED_WEB,
+                            site_data_no_plugins_durable_usage_external |
+                                BrowsingDataRemover::REMOVE_HISTORY |
+                                BrowsingDataRemover::REMOVE_DOWNLOADS);
 }