Switch Safe Browsing's metadata from string to struct.

components/safe_browsing_db/remote_database_manager.cc

 // Copyright 2015 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.
 
 #include "components/safe_browsing_db/remote_database_manager.h"
 
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 24 matching lines @@
 // RemoteSafeBrowsingDatabaseManager::ClientRequest methods
 //
 class RemoteSafeBrowsingDatabaseManager::ClientRequest {
  public:
   ClientRequest(Client* client,
                 RemoteSafeBrowsingDatabaseManager* db_manager,
                 const GURL& url);
 
   static void OnRequestDoneWeak(const base::WeakPtr<ClientRequest>& req,
                                 SBThreatType matched_threat_type,
-                                const std::string& metadata);
+                                const ThreatMetadata& metadata);
   void OnRequestDone(SBThreatType matched_threat_type,
-                     const std::string& metadata);
+                     const ThreatMetadata& metadata);
 
   // Accessors
   Client* client() const { return client_; }
   const GURL& url() const { return url_; }
   base::WeakPtr<ClientRequest> GetWeakPtr() {
     return weak_factory_.GetWeakPtr();
   }
 
  private:
   Client* client_;
   RemoteSafeBrowsingDatabaseManager* db_manager_;
   GURL url_;
   base::ElapsedTimer timer_;
   base::WeakPtrFactory<ClientRequest> weak_factory_;
 };
 
 RemoteSafeBrowsingDatabaseManager::ClientRequest::ClientRequest(
     Client* client,
     RemoteSafeBrowsingDatabaseManager* db_manager,
     const GURL& url)
     : client_(client),
       db_manager_(db_manager),
       url_(url),
       weak_factory_(this) {}
 
 // Static
 void RemoteSafeBrowsingDatabaseManager::ClientRequest::OnRequestDoneWeak(
     const base::WeakPtr<ClientRequest>& req,
     SBThreatType matched_threat_type,
-    const std::string& metadata) {
+    const ThreatMetadata& metadata) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!req)
     return;  // Previously canceled
   req->OnRequestDone(matched_threat_type, metadata);
 }
 
 void RemoteSafeBrowsingDatabaseManager::ClientRequest::OnRequestDone(
     SBThreatType matched_threat_type,
-    const std::string& metadata) {
+    const ThreatMetadata& metadata) {
   DVLOG(1) << "OnRequestDone took " << timer_.Elapsed().InMilliseconds()
            << " ms for client " << client_ << " and URL " << url_;
   client_->OnCheckBrowseUrlResult(url_, matched_threat_type, metadata);
   UMA_HISTOGRAM_TIMES("SB2.RemoteCall.Elapsed", timer_.Elapsed());
   // CancelCheck() will delete *this.
   db_manager_->CancelCheck(client_);
 }
 
 //
 // RemoteSafeBrowsingDatabaseManager methods
@@ skipping 147 matching lines @@
   UMA_HISTOGRAM_BOOLEAN("SB2.RemoteCall.CanCheckUrl", can_check_url);
   if (!can_check_url)
     return true;  // Safe, continue right away.
 
   scoped_ptr<ClientRequest> req(new ClientRequest(client, this, url));
   std::vector<SBThreatType> threat_types;  // Not currently used.
 
   DVLOG(1) << "Checking for client " << client << " and URL " << url;
   SafeBrowsingApiHandler* api_handler = SafeBrowsingApiHandler::GetInstance();
   // This shouldn't happen since SafeBrowsingResourceThrottle checks
-  // IsSupported() ealier.
+  // IsSupported() earlier.
   DCHECK(api_handler) << "SafeBrowsingApiHandler was never constructed";
   api_handler->StartURLCheck(
       base::Bind(&ClientRequest::OnRequestDoneWeak, req->GetWeakPtr()), url,
       threat_types);
 
   UMA_HISTOGRAM_COUNTS_10000("SB2.RemoteCall.ChecksPending",
                              current_requests_.size());
   current_requests_.push_back(req.release());
 
   // Defer the resource load.
@@ skipping 26 matching lines @@
 void RemoteSafeBrowsingDatabaseManager::StopOnIOThread(bool shutdown) {
   // |shutdown| is not used.
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(1) << "RemoteSafeBrowsingDatabaseManager stopping";
 
   // Call back and delete any remaining clients. OnRequestDone() modifies
   // |current_requests_|, so we make a copy first.
   std::vector<ClientRequest*> to_callback(current_requests_);
   for (auto req : to_callback) {
     DVLOG(1) << "Stopping: Invoking unfinished req for URL " << req->url();
-    req->OnRequestDone(SB_THREAT_TYPE_SAFE, std::string());
+    req->OnRequestDone(SB_THREAT_TYPE_SAFE, ThreatMetadata());
   }
   enabled_ = false;
 
   SafeBrowsingDatabaseManager::StopOnIOThread(shutdown);
 }
 
 }  // namespace safe_browsing