Remove the unused OffDomainInclusionDetector

chrome/browser/safe_browsing/safe_browsing_database.h

Index: chrome/browser/safe_browsing/safe_browsing_database.h
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h
index a05e98cd81ec2593f78c6bba55e2e6c08b2332a9..1e17f273763ec7d0448b46e32ab052efb7384ed7 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.h
+++ b/chrome/browser/safe_browsing/safe_browsing_database.h
@@ -158,9 +158,6 @@ class SafeBrowsingDatabase {
   virtual bool ContainsDownloadWhitelistedUrl(const GURL& url) = 0;
   virtual bool ContainsDownloadWhitelistedString(const std::string& str) = 0;
 
-  // Returns true if |url| is on the off-domain inclusion whitelist.
-  virtual bool ContainsInclusionWhitelistedUrl(const GURL& url) = 0;
-
   // Returns true if the given module is on the module whitelist.
   virtual bool ContainsModuleWhitelistedString(const std::string& str) = 0;
 
@@ -355,7 +352,6 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
       SafeBrowsingStore* download_store,
       SafeBrowsingStore* csd_whitelist_store,
       SafeBrowsingStore* download_whitelist_store,
-      SafeBrowsingStore* inclusion_whitelist_store,
       SafeBrowsingStore* extension_blacklist_store,
       SafeBrowsingStore* ip_blacklist_store,
       SafeBrowsingStore* unwanted_software_store,
@@ -386,7 +382,6 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
   bool ContainsCsdWhitelistedUrl(const GURL& url) override;
   bool ContainsDownloadWhitelistedUrl(const GURL& url) override;
   bool ContainsDownloadWhitelistedString(const std::string& str) override;
-  bool ContainsInclusionWhitelistedUrl(const GURL& url) override;
   bool ContainsModuleWhitelistedString(const std::string& str) override;
   bool ContainsExtensionPrefixes(const std::vector<SBPrefix>& prefixes,
                                  std::vector<SBPrefix>* prefix_hits) override;
@@ -448,7 +443,7 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
     enum class SBWhitelistId {
       CSD,
       DOWNLOAD,
-      INCLUSION,
+      obsolete_INCLUSION,

[Joe Mason, 2016/05/15 16:44:59]

Wasn't sure if it's safe to renumber this enum so I didn't remove this value.

[gab, 2016/05/16 13:27:58]

This enum is only used at runtime (not stored to disk or histogram) so it's safe
to remove this value.

Note: the only time it's not safe to remove a value and implicitly re-label
values following it is when it's used in histograms or stored to disk (in which
case best practice is to declare explicit values and leave it commented out for
reference on deprecation, e.g. as you did for ListType::INCLUSIONWHITELIST).

[Joe Mason, 2016/05/16 14:18:52]

Acknowledged. Couldn't tell from looking at the code whether it was serialized
or not.

       MODULE,
     };
     enum class PrefixSetId {
@@ -709,8 +704,6 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
   //     bit hashes.
   //   - |download_whitelist_store_|: For the download whitelist chunks and
   //     full-length hashes.  This list only contains 256 bit hashes.
-  //   - |inclusion_whitelist_store_|: For the inclusion whitelist. Same format
-  //     as |download_whitelist_store_|.
   //   - |extension_blacklist_store_|: For extension IDs.
   //   - |ip_blacklist_store_|: For IP blacklist.
   //   - |unwanted_software_store_|: For unwanted software list (format
@@ -730,7 +723,6 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
   const std::unique_ptr<SafeBrowsingStore> download_store_;
   const std::unique_ptr<SafeBrowsingStore> csd_whitelist_store_;
   const std::unique_ptr<SafeBrowsingStore> download_whitelist_store_;
-  const std::unique_ptr<SafeBrowsingStore> inclusion_whitelist_store_;
   const std::unique_ptr<SafeBrowsingStore> extension_blacklist_store_;
   const std::unique_ptr<SafeBrowsingStore> ip_blacklist_store_;
   const std::unique_ptr<SafeBrowsingStore> unwanted_software_store_;