Split browsing data masks between content and embedder

chrome/browser/browsing_data/browsing_data_helper.h

Index: chrome/browser/browsing_data/browsing_data_helper.h
diff --git a/chrome/browser/browsing_data/browsing_data_helper.h b/chrome/browser/browsing_data/browsing_data_helper.h
index 780a62d0c6144940d9dd6797b455fefc29b0e322..09e6ed53b66788f83d5b31ce1ed02c3b520bdae6 100644
--- a/chrome/browser/browsing_data/browsing_data_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_helper.h
@@ -11,22 +11,18 @@
 
 #include "base/macros.h"
 
-namespace storage {
-class SpecialStoragePolicy;
-}
-
 class GURL;
 
+// TODO(crbug.com/668114): DEPRECATED. Remove this class.
+// The primary functionality of testing origin type masks has moved to
+// BrowsingDataRemover. The secondary functionality of recognizing web schemes
+// storing browsing data has moved to url::GetWebStorageSchemes();
+// or alternatively, it can also be retrieved from BrowsingDataRemover by
+// testing the ORIGIN_TYPE_UNPROTECTED_ORIGIN | ORIGIN_TYPE_PROTECTED_ORIGIN
+// origin mask. This class now merely forwards the functionality to several
+// helper classes in the browsing_data codebase.
 class BrowsingDataHelper {
  public:
-  enum OriginTypeMask {
-    UNPROTECTED_WEB = 1 << 0,  // drive-by web.
-    PROTECTED_WEB = 1 << 1,    // hosted applications.
-    EXTENSION = 1 << 2,        // chrome-extension://*
-    // Always add new items to the enum above ALL and add them to ALL.
-    ALL = UNPROTECTED_WEB | PROTECTED_WEB | EXTENSION,
-  };
-
   // Returns true iff the provided scheme is (really) web safe, and suitable
   // for treatment as "browsing data". This relies on the definition of web safe
   // in ChildProcessSecurityPolicy, but excluding schemes like
@@ -38,11 +34,6 @@ class BrowsingDataHelper {
   static bool IsExtensionScheme(const std::string& scheme);
   static bool HasExtensionScheme(const GURL& origin);
 
-  // Returns true if the provided origin matches the provided mask.
-  static bool DoesOriginMatchMask(const GURL& origin,
-                                  int origin_type_mask,
-                                  storage::SpecialStoragePolicy* policy);
-
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(BrowsingDataHelper);
 };