Store list information in ListInfo (was: StoreIdAndFIleName)

components/safe_browsing_db/v4_local_database_manager.h

 // Copyright 2016 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.
 
 #ifndef COMPONENTS_SAFE_BROWSING_DB_V4_LOCAL_DATABASE_MANAGER_H_
 #define COMPONENTS_SAFE_BROWSING_DB_V4_LOCAL_DATABASE_MANAGER_H_
 
 // A class that provides the interface between the SafeBrowsing protocol manager
 // and database that holds the downloaded updates.
 
@@ skipping 99 matching lines @@
   }
   FRIEND_TEST_ALL_PREFIXES(V4LocalDatabaseManagerTest,
                            TestGetSeverestThreatTypeAndMetadata);
 
   // The set of clients awaiting a full hash response. It is used for tracking
   // which clients have cancelled their outstanding request.
   typedef std::unordered_set<Client*> PendingClients;
 
   ~V4LocalDatabaseManager() override;
 
+  // Returns the SBThreatType for a given ListIdentifier.
+  SBThreatType GetSBThreatTypeForList(const ListIdentifier& list_id);
+
+  // Finds the most severe |SBThreatType| and the corresponding |metadata| from
+  // |full_hash_infos|.
+  void GetSeverestThreatTypeAndMetadata(
+      SBThreatType* result_threat_type,
+      ThreatMetadata* metadata,
+      const std::vector<FullHashInfo>& full_hash_infos);
+
   // The callback called each time the protocol manager downloads updates
   // successfully.
   void UpdateRequestCompleted(
       std::unique_ptr<ParsedServerResponse> parsed_server_response);
 
   void SetupUpdateProtocolManager(
       net::URLRequestContextGetter* request_context_getter,
       const V4ProtocolConfig& config);
 
   void SetupDatabase();
 
   // Called when the |v4_get_hash_protocol_manager_| has the full hash response
-  // avaialble for the URL that we requested. It determines the severest
+  // available for the URL that we requested. It determines the severest
   // threat type and responds to the |client| with that information.
   void OnFullHashResponse(std::unique_ptr<PendingCheck> pending_check,
                           const std::vector<FullHashInfo>& full_hash_infos);
 
   // Called when all the stores managed by the database have been read from
   // disk after startup and the database is ready for use.
   void DatabaseReady(std::unique_ptr<V4Database> v4_database);
 
   // Called when the database has been updated and schedules the next update.
   void DatabaseUpdated();
 
   // Calls the appopriate method on the |client| object, based on the contents
   // of |pending_check|.
   void RespondToClient(std::unique_ptr<PendingCheck> pending_check);
 
-  // Finds the most severe |SBThreatType| and the corresponding |metadata| from
-  // |full_hash_infos|.
-  static void GetSeverestThreatTypeAndMetadata(
-      SBThreatType* result_threat_type,
-      ThreatMetadata* metadata,
-      const std::vector<FullHashInfo>& full_hash_infos);
-
   // The base directory under which to create the files that contain hashes.
   const base::FilePath base_path_;
 
   // Whether the service is running.
   bool enabled_;
 
   // The set of clients that are waiting for a full hash response from the
   // SafeBrowsing service.
   PendingClients pending_clients_;
 
-  // The list of stores to manage (for hash prefixes and full hashes), along
-  // with the corresponding filename on disk for each of them.
-  StoreIdAndFileNames store_id_file_names_;
+  // The list of stores to manage (for hash prefixes and full hashes). Each
+  // element contains the identifier for the store, the corresponding
+  // SBThreatType, whether to fetch hash prefixes for that store, and the
+  // name of the file on disk that would contain the prefixes, if applicable.
+  ListInfos list_infos_;
 
   // The protocol manager that downloads the hash prefix updates.
   std::unique_ptr<V4UpdateProtocolManager> v4_update_protocol_manager_;
 
   // The database that manages the stores containing the hash prefix updates.
   // All writes to this variable must happen on the IO thread only.
   std::unique_ptr<V4Database> v4_database_;
 
   // Called when the V4Database has finished applying the latest update and is
   // ready to process next update.
   DatabaseUpdatedCallback db_updated_callback_;
 
   // The sequenced task runner for running safe browsing database operations.
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   friend class base::RefCountedThreadSafe<V4LocalDatabaseManager>;
   DISALLOW_COPY_AND_ASSIGN(V4LocalDatabaseManager);
 };  // class V4LocalDatabaseManager
 
 }  // namespace safe_browsing
 
 #endif  // COMPONENTS_SAFE_BROWSING_DB_V4_LOCAL_DATABASE_MANAGER_H_