Add the goog-unwanted-shavar list to a new SafeBrowsing PrefixSet.

chrome/browser/safe_browsing/database_manager.h

 // 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.
 //
 // The Safe Browsing service is responsible for downloading anti-phishing and
 // anti-malware tables and checking urls against them.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_DATABASE_MANAGER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_DATABASE_MANAGER_H_
 
@@ skipping 198 matching lines @@
 
   // protected for tests.
   void NotifyDatabaseUpdateFinished(bool update_succeeded);
 
  private:
   friend class base::RefCountedThreadSafe<SafeBrowsingDatabaseManager>;
   friend class SafeBrowsingServerTest;
   friend class SafeBrowsingServiceTest;
   friend class SafeBrowsingServiceTestHelper;
   friend class SafeBrowsingDatabaseManagerTest;
-  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingDatabaseManagerTest, GetUrlThreatType);
+  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingDatabaseManagerTest,
+                           GetUrlSeverestThreatType);
 
   typedef std::set<SafeBrowsingCheck*> CurrentChecks;
   typedef std::vector<SafeBrowsingCheck*> GetHashRequestors;
   typedef base::hash_map<SBPrefix, GetHashRequestors> GetHashRequests;
 
   // Clients that we've queued up for checking later once the database is ready.
   struct QueuedCheck {
     QueuedCheck(const safe_browsing_util::ListType check_type,
                 Client* client,
                 const GURL& url,
                 const std::vector<SBThreatType>& expected_threats,
                 const base::TimeTicks& start);
     ~QueuedCheck();
     safe_browsing_util::ListType check_type;
     Client* client;
     GURL url;
     std::vector<SBThreatType> expected_threats;
     base::TimeTicks start;  // When check was queued.
   };
 
-  // Return the threat type from the first result in |full_hashes| which matches
+  // Return the threat type of the severest entry in |full_hashes| which matches
   // |hash|, or SAFE if none match.
-  static SBThreatType GetHashThreatType(
+  static SBThreatType GetHashSeverestThreatType(
       const SBFullHash& hash,
       const std::vector<SBFullHashResult>& full_hashes);
 
   // Given a URL, compare all the possible host + path full hashes to the set of
-  // provided full hashes.  Returns the threat type of the matching result from
-  // |full_hashes|, or SAFE if none match.
-  static SBThreatType GetUrlThreatType(
+  // provided full hashes.  Returns the threat type of the severest matching
+  // result from |full_hashes|, or SAFE if none match.
+  static SBThreatType GetUrlSeverestThreatType(
       const GURL& url,
       const std::vector<SBFullHashResult>& full_hashes,
       size_t* index);
 
   // Called to stop operations on the io_thread. This may be called multiple
   // times during the life of the DatabaseManager. Should be called on IO
   // thread.
   void DoStopOnIOThread();
 
   // Returns whether |database_| exists and is accessible.
@@ skipping 122 matching lines @@
 
   // Indicate if the extension blacklist should be enabled.
   bool enable_extension_blacklist_;
 
   // Indicate if the side effect free whitelist should be enabled.
   bool enable_side_effect_free_whitelist_;
 
   // Indicate if the csd malware IP blacklist should be enabled.
   bool enable_ip_blacklist_;
 
+  // Indicate if the unwanted software blacklist should be enabled.
+  bool enable_unwanted_software_blacklist_;
+
   // The SafeBrowsing thread that runs database operations.
   //
   // Note: Functions that run on this thread should run synchronously and return
   // to the IO thread, not post additional tasks back to this thread, lest we
   // cause a race condition at shutdown time that leads to a database leak.
   scoped_ptr<base::Thread> safe_browsing_thread_;
 
   // Indicates if we're currently in an update cycle.
   bool update_in_progress_;
 
   // When true, newly fetched chunks may not in the database yet since the
   // database is still updating.
   bool database_update_in_progress_;
 
   // Indicates if we're in the midst of trying to close the database.  If this
   // is true, nothing on the IO thread should access the database.
   bool closing_database_;
 
   std::deque<QueuedCheck> queued_checks_;
 
   // Timeout to use for safe browsing checks.
   base::TimeDelta check_timeout_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingDatabaseManager);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_DATABASE_MANAGER_H_