Switch Safe Browsing's metadata from string to struct.

chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

 // 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.
 //
 // This test creates a safebrowsing service using test safebrowsing database
 // and a test protocol manager. It is used to test logics in safebrowsing
 // service.
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 
@@ skipping 687 matching lines @@
  public:
   SafeBrowsingServiceMetadataTest() {}
 
   void GenUrlFullhashResultWithMetadata(const GURL& url,
                                         SBFullHashResult* full_hash) {
     GenUrlFullhashResult(url, MALWARE, full_hash);
 
     MalwarePatternType proto;
     switch (GetParam()) {
       case METADATA_NONE:
-        full_hash->metadata = std::string();
+        full_hash->metadata.raw_metadata = std::string();
         break;
       case METADATA_LANDING:
         proto.set_pattern_type(MalwarePatternType::LANDING);
-        full_hash->metadata = proto.SerializeAsString();
+        full_hash->metadata.raw_metadata = proto.SerializeAsString();
         break;
       case METADATA_DISTRIBUTION:
         proto.set_pattern_type(MalwarePatternType::DISTRIBUTION);
-        full_hash->metadata = proto.SerializeAsString();
+        full_hash->metadata.raw_metadata = proto.SerializeAsString();
         break;
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceMetadataTest);
 };
 
 IN_PROC_BROWSER_TEST_P(SafeBrowsingServiceMetadataTest, MalwareMainFrame) {
   GURL url = embedded_test_server()->GetURL(kEmptyPage);
@@ skipping 485 matching lines @@
   void OnCheckDownloadUrlResult(const std::vector<GURL>& /* url_chain */,
                                 SBThreatType threat_type) override {
     threat_type_ = threat_type;
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             base::Bind(&TestSBClient::CheckDone, this));
   }
 
   // Called when the result of checking a browse URL is known.
   void OnCheckBrowseUrlResult(const GURL& /* url */,
                               SBThreatType threat_type,
-                              const std::string& /* metadata */) override {
+                              const ThreatMetadata& /* metadata */) override {
     threat_type_ = threat_type;
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             base::Bind(&TestSBClient::CheckDone, this));
   }
 
   // Called when the result of checking a resource URL is known.
   void OnCheckResourceUrlResult(const GURL& /* url */,
                                 SBThreatType threat_type,
                                 const std::string& threat_hash) override {
     threat_type_ = threat_type;
@@ skipping 516 matching lines @@
       chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE,
       content::Source<SafeBrowsingDatabaseManager>(
           sb_service_->database_manager().get()));
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SafeBrowsingDatabaseManagerCookieTest::ForceUpdate, this));
   observer.Wait();
 }
 
 }  // namespace safe_browsing